3.18.rc1: compile failure in tsc2005.c

Commit Message

Pavel Machek Oct. 23, 2014, 4:42 p.m. UTC

Hi!

Oops, ignore me, this is part of n900 changes that did not make it to
mainline.

> > I get this. Before I start patching it, perhaps someone has
> > fixed it already?
> > 
> >   CC      drivers/input/touchscreen/tsc2005.o
> > drivers/input/touchscreen/tsc2005.c: In function
> > 'tsc2005_disable_store':
> > drivers/input/touchscreen/tsc2005.c:406:2: error: implicit
> > declaration of function 'strict_strtoul'
> > [-Werror=implicit-function-declaration] cc1: some warnings
> > being treated as errors
n> > scripts/Makefile.build:257: recipe for target
> > 'drivers/input/touchscreen/tsc2005.o' failed
> > make[3]: *** [drivers/input/touchscreen/tsc2005.o] Error 1
> > scripts/Makefile.build:402: recipe for target
> > 'drivers/input/touchscreen' failed
> > make[2]: *** [drivers/input/touchscreen] Error 2
> > scripts/Makefile.build:402: recipe for target 'drivers/input'
> > failed make[1]: *** [drivers/input] Error 2
> > make[1]: *** Waiting for unfinished jobs....
> >   CC      net/core/request_sock.o
> 
> Hi, I read somewhere that strict_strtoul function was replaced by 
> some kstrtol function... So maybe somebody forgot to fix tsc2005 
> driver?

Yes.. there are four places in n900 patches that will need fixing.

This only applies to Pali's tree.

Signed-off-by: Pavel Machek <[e-mail]>

									Pavel

commit 1f031685bd14a13242f78e7cc9cc1cd767aa3dbc
Author: Pavel <[e-mail]>
Date:   Thu Oct 23 17:23:16 2014 +0200

    Fix compilation by replacing strict_strtoul to kstrtoul
    
    Signed-off-by: Pavel Machek <[e-mail]>

Patch

diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c
index 394c45b..ceed4f3 100644
--- a/arch/arm/plat-omap/gpio-switch.c
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -197,7 +197,7 @@  static ssize_t gpio_sw_disable_store(struct device *dev,
 	struct gpio_switch *sw = dev_get_drvdata(dev);
 	unsigned long res;
 
-	if (strict_strtoul(buf, 10, &res) < 0)
+	if (kstrtoul(buf, 10, &res) < 0)
 		return -EINVAL;
 
 	if (!!res == sw->disabled)
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 422ec6e..ec1c276 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -403,7 +403,7 @@  static ssize_t tsc2005_disable_store(struct device *dev,
 	unsigned long val;
 	int error;
 
-	error = strict_strtoul(buf, 10, &val);
+	error = kstrtoul(buf, 10, &val);
 	if (error)
 		return error;
 
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index 3a986f3..f697e5f 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -1506,7 +1506,7 @@  static ssize_t wl1251_sysfs_store_tx_mgmt_frm_rate(struct device *dev,
 	unsigned long res;
 	int ret;
 
-	ret = strict_strtoul(buf, 10, &res);
+	ret = kstrtoul(buf, 10, &res);
 
 	if (ret < 0) {
 		wl1251_warning("incorrect value written to tx_mgmt_frm_rate");
@@ -1600,7 +1600,7 @@  static ssize_t wl1251_sysfs_store_bt_coex_mode(struct device *dev,
 	unsigned long res;
 	int ret;
 
-	ret = strict_strtoul(buf, 10, &res);
+	ret = kstrtoul(buf, 10, &res);
 
 	if (ret < 0) {
 		wl1251_warning("incorrect value written to bt_coex_mode");