linux-kernel - [PATCH] gpio: merrifield: Fix build err without CONFIG

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-next>] [day] [month] [year] [list]

Date:   Thu, 4 Apr 2019 18:39:25 +0800
From:   Yue Haibing <yuehaibing@...wei.com>
To:     <andriy.shevchenko@...ux.intel.com>, <linus.walleij@...aro.org>,
        <bgolaszewski@...libre.com>
CC:     <linux-kernel@...r.kernel.org>, <linux-gpio@...r.kernel.org>,
        YueHaibing <yuehaibing@...wei.com>
Subject: [PATCH] gpio: merrifield: Fix build err without CONFIG_ACPI

From: YueHaibing <yuehaibing@...wei.com>

When building CONFIG_ACPI is not set
gcc warn this:

drivers/gpio/gpio-merrifield.c: In function mrfld_gpio_get_pinctrl_dev_name:
drivers/gpio/gpio-merrifield.c:388:19: error: dereferencing pointer to incomplete type struct acpi_device
   put_device(&adev->dev);
                   ^
Reported-by: Hulk Robot <hulkci@...wei.com>
Fixes:d00d2109c367 ("gpio: merrifield: Convert to use acpi_dev_get_first_match_dev()")
Signed-off-by: YueHaibing <yuehaibing@...wei.com>
---
 drivers/gpio/gpio-merrifield.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c
index 2383dc7..78ac32f 100644
--- a/drivers/gpio/gpio-merrifield.c
+++ b/drivers/gpio/gpio-merrifield.c
@@ -379,17 +379,18 @@ static void mrfld_irq_init_hw(struct mrfld_gpio *priv)
 
 static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv)
 {
-	struct acpi_device *adev;
 	const char *name;
+#ifdef CONFIG_ACPI
+	struct acpi_device *adev;
 
 	adev = acpi_dev_get_first_match_dev("INTC1002", NULL, -1);
 	if (adev) {
 		name = devm_kstrdup(priv->dev, acpi_dev_name(adev), GFP_KERNEL);
 		put_device(&adev->dev);
-	} else {
-		name = "pinctrl-merrifield";
 	}
-
+#else
+	name = "pinctrl-merrifield";
+#endif
 	return name;
 }
 
-- 
2.7.4