Re: linux-next: build failure after merge of the gpio-brgl tree

[Rob Herring <robh@xxxxxxxxxx>]

On Mon, Nov 15, 2021 at 5:51 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> After merging the gpio-brgl tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpio/gpio-xlp.c:300:16: error: 'GPIO_VARIANT_VULCAN' undeclared here (not in a function)
>   300 |  { "BRCM9006", GPIO_VARIANT_VULCAN },
>       |                ^~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   ea708ac5bf41 ("gpio: xlp: Remove Netlogic XLP variants")

Here's the fix needed. Bartosz, let me know if you want a proper patch.

diff --git a/drivers/gpio/gpio-xlp.c b/drivers/gpio/gpio-xlp.c
index 814cc34aef97..c15ca977016c 100644
--- a/drivers/gpio/gpio-xlp.c
+++ b/drivers/gpio/gpio-xlp.c
@@ -297,8 +297,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);