Skip to content

Commit

Permalink
gpio: xlp: Fix build errors from Netlogic XLP removal
Browse files Browse the repository at this point in the history
Commit ea708ac ("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: ea708ac ("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>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
  • Loading branch information
Rob Herring authored and Bartosz Golaszewski committed Dec 3, 2021
1 parent adc8b4b commit e320d9c
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/gpio/gpio-xlp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit e320d9c

Please sign in to comment.