[PATCH] gpio: xlp: Fix build errors from Netlogic XLP removal

[PATCH] gpio: xlp: Fix build errors from Netlogic XLP removal

[Rob Herring]

Commit ea708ac5bf41 ("gpio: xlp: Remove Netlogic XLP variants") has
build errors with CONFIG_ACPI:

drivers/gpio/gpio-xlp.c:300:23: error: 'GPIO_VARIANT_VULCAN' undeclared here (not in a function)

and !CONFIG_OF:

drivers/gpio/gpio-xlp.c:267:11: error: 'struct gpio_chip' has no member named 'of_node'

Fix these errors.

Fixes: ea708ac5bf41 ("gpio: xlp: Remove Netlogic XLP variants")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: linux-gpio@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/gpio/gpio-xlp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
index 814cc34aef97..0199f545335f 100644
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -264,7 +264,6 @@ static int xlp_gpio_probe(struct platform_device *pdev)
 	gc->base = 0;
 	gc->parent = &pdev->dev;
 	gc->ngpio = 70;
-	gc->of_node = pdev->dev.of_node;
 	gc->direction_output = xlp_gpio_dir_output;
 	gc->direction_input = xlp_gpio_dir_input;
 	gc->set = xlp_gpio_set;
@@ -297,8 +296,8 @@ static int xlp_gpio_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xlp_gpio_acpi_match[] = {
-	{ "BRCM9006", GPIO_VARIANT_VULCAN },
-	{ "CAV9006",  GPIO_VARIANT_VULCAN },
+	{ "BRCM9006" },
+	{ "CAV9006" },
 	{},
 };
 MODULE_DEVICE_TABLE(acpi, xlp_gpio_acpi_match);
-- 
2.32.0

Re: [PATCH] gpio: xlp: Fix build errors from Netlogic XLP removal

[Bartosz Golaszewski]

On Wed, Dec 1, 2021 at 10:43 PM Rob Herring <robh@kernel.org> wrote:
>
> Commit ea708ac5bf41 ("gpio: xlp: Remove Netlogic XLP variants") has
> build errors with CONFIG_ACPI:
>
> drivers/gpio/gpio-xlp.c:300:23: error: 'GPIO_VARIANT_VULCAN' undeclared here (not in a function)
>
> and !CONFIG_OF:
>
> drivers/gpio/gpio-xlp.c:267:11: error: 'struct gpio_chip' has no member named 'of_node'
>
> Fix these errors.
>
> Fixes: ea708ac5bf41 ("gpio: xlp: Remove Netlogic XLP variants")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Reported-by: kernel test robot <lkp@intel.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Bartosz Golaszewski <brgl@bgdev.pl>
> Cc: linux-gpio@vger.kernel.org
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  drivers/gpio/gpio-xlp.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
> index 814cc34aef97..0199f545335f 100644
> --- a/drivers/gpio/gpio-xlp.c
> +++ b/drivers/gpio/gpio-xlp.c
> @@ -264,7 +264,6 @@ static int xlp_gpio_probe(struct platform_device *pdev)
>         gc->base = 0;
>         gc->parent = &pdev->dev;
>         gc->ngpio = 70;
> -       gc->of_node = pdev->dev.of_node;
>         gc->direction_output = xlp_gpio_dir_output;
>         gc->direction_input = xlp_gpio_dir_input;
>         gc->set = xlp_gpio_set;
> @@ -297,8 +296,8 @@ static int xlp_gpio_probe(struct platform_device *pdev)
>
>  #ifdef CONFIG_ACPI
>  static const struct acpi_device_id xlp_gpio_acpi_match[] = {
> -       { "BRCM9006", GPIO_VARIANT_VULCAN },
> -       { "CAV9006",  GPIO_VARIANT_VULCAN },
> +       { "BRCM9006" },
> +       { "CAV9006" },
>         {},
>  };
>  MODULE_DEVICE_TABLE(acpi, xlp_gpio_acpi_match);
> --
> 2.32.0
>

Applied, thanks!

Bart