diff mbox

gpio: pca953x: make inclusion of <linux/of_platform.h> unconditional

Message ID 1449655574-6550-1-git-send-email-linus.walleij@linaro.org
State Accepted
Commit c2369d3f8cad978dae54fe2149c055a851c32a02
Headers show

Commit Message

Linus Walleij Dec. 9, 2015, 10:06 a.m. UTC
After adding the DT matching in
commit 6f29c9afbe636fc0e35c82a11eaf45c3b85eb07a
"gpio: pca935x: fix of-only probed devices"
compilation fails like this:

CC [M]  drivers/gpio/gpio-pca953x.o
gpio-pca953x.c: In function ‘pca953x_probe’:
gpio-pca953x.c:693:11: error: implicit declaration of
function ‘of_match_device’ [-Werror=implicit-function-declaration]
match = of_match_device(pca953x_dt_ids, &client->dev);
        ^
gpio-pca953x.c:693:9: warning: assignment makes pointer from
integer without a cast [-Wint-conversion]
match = of_match_device(pca953x_dt_ids, &client->dev);
        ^
cc1: some warnings being treated as errors
../scripts/Makefile.build:264: recipe for target
'drivers/gpio/gpio-pca953x.o' failed

After removing the conditional inclusion guards compilation
works fine again. Might be a module problem so that
fix.

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
 drivers/gpio/gpio-pca953x.c | 2 --
 1 file changed, 2 deletions(-)

-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Linus Walleij Dec. 10, 2015, 6:30 p.m. UTC | #1
On Wed, Dec 9, 2015 at 11:53 AM, Ben Dooks <ben.dooks@codethink.co.uk> wrote:
> On 09/12/15 10:06, Linus Walleij wrote:

>> After adding the DT matching in

>> commit 6f29c9afbe636fc0e35c82a11eaf45c3b85eb07a

>> "gpio: pca935x: fix of-only probed devices"

>> compilation fails like this:

>>

>> CC [M]  drivers/gpio/gpio-pca953x.o

>> gpio-pca953x.c: In function ‘pca953x_probe’:

>> gpio-pca953x.c:693:11: error: implicit declaration of

>> function ‘of_match_device’ [-Werror=implicit-function-declaration]

>> match = of_match_device(pca953x_dt_ids, &client->dev);

>

> Thanks, given the driver makes no other attempt to remove OF

> lists if there is no OF present then this may as well be

> unconditionally included.


Hm it seems to fail compilation on a few defconfigs still...
Need to think about adding deps or reintroducing these ifdefs.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 14729657a112..2eaf235a39e5 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -18,9 +18,7 @@ 
 #include <linux/i2c.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/slab.h>
-#ifdef CONFIG_OF_GPIO
 #include <linux/of_platform.h>
-#endif
 #include <linux/acpi.h>
 
 #define PCA953X_INPUT		0