leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: xlp: Fix build errors from Netlogic XLP removal

Browse Source 
Commit ea708ac5bf ("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: ea708ac5bf ("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>
This commit is contained in:
Rob Herring 2021-12-01 15:43:05 -06:00 committed by Bartosz Golaszewski
parent adc8b4bf2a
commit e320d9c2e9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpio/gpio-xlp.c
View File

@ -264,7 +264,6 @@ static int xlp_gpio_probe(struct platform_device *pdev)
gc->base = 0; gc->base = 0;
gc->parent = &pdev->dev; gc->parent = &pdev->dev;
gc->ngpio = 70; gc->ngpio = 70;
gc->of_node = pdev->dev.of_node;
gc->direction_output = xlp_gpio_dir_output; gc->direction_output = xlp_gpio_dir_output;
gc->direction_input = xlp_gpio_dir_input; gc->direction_input = xlp_gpio_dir_input;
gc->set = xlp_gpio_set; gc->set = xlp_gpio_set;
@ -297,8 +296,8 @@ static int xlp_gpio_probe(struct platform_device *pdev)
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static const struct acpi_device_id xlp_gpio_acpi_match[] = { static const struct acpi_device_id xlp_gpio_acpi_match[] = {
{ "BRCM9006", GPIO_VARIANT_VULCAN }, { "BRCM9006" },
{ "CAV9006", GPIO_VARIANT_VULCAN }, { "CAV9006" },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, xlp_gpio_acpi_match); MODULE_DEVICE_TABLE(acpi, xlp_gpio_acpi_match);