Skip to content

Commit e320d9c

Browse files
robherringbrgl
authored andcommitted
gpio: xlp: Fix build errors from Netlogic XLP removal
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 <[email protected]> Reported-by: kernel test robot <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Bartosz Golaszewski <[email protected]> Cc: [email protected] Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent adc8b4b commit e320d9c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/gpio/gpio-xlp.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ static int xlp_gpio_probe(struct platform_device *pdev)
264264
gc->base = 0;
265265
gc->parent = &pdev->dev;
266266
gc->ngpio = 70;
267-
gc->of_node = pdev->dev.of_node;
268267
gc->direction_output = xlp_gpio_dir_output;
269268
gc->direction_input = xlp_gpio_dir_input;
270269
gc->set = xlp_gpio_set;
@@ -297,8 +296,8 @@ static int xlp_gpio_probe(struct platform_device *pdev)
297296

298297
#ifdef CONFIG_ACPI
299298
static const struct acpi_device_id xlp_gpio_acpi_match[] = {
300-
{ "BRCM9006", GPIO_VARIANT_VULCAN },
301-
{ "CAV9006", GPIO_VARIANT_VULCAN },
299+
{ "BRCM9006" },
300+
{ "CAV9006" },
302301
{},
303302
};
304303
MODULE_DEVICE_TABLE(acpi, xlp_gpio_acpi_match);

0 commit comments

Comments
 (0)