Skip to contentSkip to conversation

gpio: xlp: Fix build errors from Netlogic XLP removal

PATCH Applied Rob Herring 2 participants 2 messages Dec 1, 2021 – Dec 3, 2021 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: xlp: Fix build errors from Netlogic XLP removal

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")
Cc Linus Walleij <[email protected]>
Cc Bartosz Golaszewski <[email protected]>
---
 drivers/gpio/gpio-xlp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpio/gpio-xlp.c +2 -3
index 814cc34aef97..0199f545335f 100644
@@ -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);
Signature · 1 line
2.32.0
#1 lore raw
Quoted 47 lines · 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")
Cc Linus Walleij <[email protected]>
Cc Bartosz Golaszewski <[email protected]>
---
 drivers/gpio/gpio-xlp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpio/gpio-xlp.c +2 -4
index 814cc34aef97..0199f545335f 100644
@@ -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);
--
Quoted 2 lines

2.32.0

Applied, thanks!

Bart