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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAL_JsqL0bWTW_yYS8A8kE2Q5GxUZr-C8DV9bduDrwpZob1+1kw@mail.gmail.com>
Date:   Wed, 17 Nov 2021 15:29:15 -0600
From:   Rob Herring <robh@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@...ev.pl>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the gpio-brgl tree

On Mon, Nov 15, 2021 at 5:51 PM Stephen Rothwell <sfr@...b.auug.org.au> 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);