strict_strtoul is obsolete, use kstrtoul instead

based on http://patchwork.openwrt.org/patch/3827/

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 37562

diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index 681291dc55091967d8c49477123df4eb2acf2efa..d6d1ae2e638c3578609fa1db91af9799cb5a07c9 100644 (file)
--- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -47,7 +47,7 @@
 +              return -EFAULT;
 +
 +      buf[len] = '\0';
-+      if (strict_strtoul(buf, 0, &chan_bw))
++      if (kstrtoul(buf, 0, &chan_bw))
 +              return -EINVAL;
 +
 +      sc->chan_bw = chan_bw;

diff --git a/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch
index db380b081429c9c88a691e9306de66c135c8180f..7cf1c2a3fd202a13f9756a8732190c6ca63dcb63 100644 (file)
--- a/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch
+++ b/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch
@@ -30,7 +30,7 @@
 +              return -EFAULT;
 +
 +      buf[len] = '\0';
-+      if (strict_strtoul(buf, 0, &diag))
++      if (kstrtoul(buf, 0, &diag))
 +              return -EINVAL;
 +
 +      ah->diag = diag;

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index e2b4f02efaad11a2c627deb1fb671112bd5bdd4a..699234d22dad97091d3e465e99e2cb74a408d776 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -743,7 +743,7 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file,
                buf[len - 1] = '\0';
 
 
-       if (strict_strtoul(buf, 16, &data)) {
+       if (kstrtoul(buf, 16, &data)) {
                dev_err(smi->parent, "Invalid reg value %s\n", buf);
        } else {
                err = rtl8366_smi_write_reg(smi, reg, data);

diff --git a/target/linux/generic/patches-3.10/863-gpiommc.patch b/target/linux/generic/patches-3.10/863-gpiommc.patch
index a9101f473bf3267fa9805d85092a225acb31a17e..00f7c8d2ecfd5870167a1a756444a44014c37e7e 100644 (file)
--- a/target/linux/generic/patches-3.10/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.10/863-gpiommc.patch
@@ -357,7 +357,7 @@
 +      unsigned long data;
 +
 +      if (attr == &gpiommc_attr_register) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -378,7 +378,7 @@
 +      }
 +
 +      if (attr == &gpiommc_attr_DI) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -389,7 +389,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_DO) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -400,7 +400,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CLK) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -411,7 +411,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -422,7 +422,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS_activelow) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -433,7 +433,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spimode) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -457,7 +457,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spidelay) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -468,7 +468,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_max_bus_speed) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;

diff --git a/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch
index d4201eb50886e1e8f31ee0d4235d611b29e35afa..92815d91f4cdc001aa59e0277f74bc6421ad83c4 100644 (file)
--- a/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch
+++ b/target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch
@@ -37,7 +37,7 @@ does not lock access between files.
 +      mutex_lock(&dev->mutex);
 +
        if (attr == &gpiommc_attr_register) {
-               err = strict_strtoul(page, 10, &data);
+               err = kstrtoul(page, 10, &data);
                if (err)
 @@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
        WARN_ON(1);

diff --git a/target/linux/generic/patches-3.3/863-gpiommc.patch b/target/linux/generic/patches-3.3/863-gpiommc.patch
index 32606711f5e551204146236fdbccb3ee0474a701..5e5325f197b0b0c6cd590cc4a69c4ebd6d28a9bb 100644 (file)
--- a/target/linux/generic/patches-3.3/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.3/863-gpiommc.patch
@@ -357,7 +357,7 @@
 +      unsigned long data;
 +
 +      if (attr == &gpiommc_attr_register) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -378,7 +378,7 @@
 +      }
 +
 +      if (attr == &gpiommc_attr_DI) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -389,7 +389,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_DO) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -400,7 +400,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CLK) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -411,7 +411,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -422,7 +422,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS_activelow) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -433,7 +433,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spimode) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -457,7 +457,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spidelay) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -468,7 +468,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_max_bus_speed) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;

diff --git a/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch
index d4201eb50886e1e8f31ee0d4235d611b29e35afa..92815d91f4cdc001aa59e0277f74bc6421ad83c4 100644 (file)
--- a/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch
+++ b/target/linux/generic/patches-3.3/864-gpiommc_configfs_locking.patch
@@ -37,7 +37,7 @@ does not lock access between files.
 +      mutex_lock(&dev->mutex);
 +
        if (attr == &gpiommc_attr_register) {
-               err = strict_strtoul(page, 10, &data);
+               err = kstrtoul(page, 10, &data);
                if (err)
 @@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
        WARN_ON(1);

diff --git a/target/linux/generic/patches-3.6/863-gpiommc.patch b/target/linux/generic/patches-3.6/863-gpiommc.patch
index 2e8d4da123020ebb0c069671a3ef46f3d3c31677..f0e2b4f15f63bcfc1165d1c8fbc8951af10fe6ac 100644 (file)
--- a/target/linux/generic/patches-3.6/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.6/863-gpiommc.patch
@@ -357,7 +357,7 @@
 +      unsigned long data;
 +
 +      if (attr == &gpiommc_attr_register) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -378,7 +378,7 @@
 +      }
 +
 +      if (attr == &gpiommc_attr_DI) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -389,7 +389,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_DO) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -400,7 +400,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CLK) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -411,7 +411,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -422,7 +422,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS_activelow) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -433,7 +433,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spimode) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -457,7 +457,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spidelay) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -468,7 +468,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_max_bus_speed) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;

diff --git a/target/linux/generic/patches-3.6/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.6/864-gpiommc_configfs_locking.patch
index d4201eb50886e1e8f31ee0d4235d611b29e35afa..92815d91f4cdc001aa59e0277f74bc6421ad83c4 100644 (file)
--- a/target/linux/generic/patches-3.6/864-gpiommc_configfs_locking.patch
+++ b/target/linux/generic/patches-3.6/864-gpiommc_configfs_locking.patch
@@ -37,7 +37,7 @@ does not lock access between files.
 +      mutex_lock(&dev->mutex);
 +
        if (attr == &gpiommc_attr_register) {
-               err = strict_strtoul(page, 10, &data);
+               err = kstrtoul(page, 10, &data);
                if (err)
 @@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
        WARN_ON(1);

diff --git a/target/linux/generic/patches-3.8/863-gpiommc.patch b/target/linux/generic/patches-3.8/863-gpiommc.patch
index f275c65a35b8a2669fb2bc4e14ab44692b4b141c..5f74f1bc7c280fe1ab1ea169c3ef40bc4c6e49e9 100644 (file)
--- a/target/linux/generic/patches-3.8/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.8/863-gpiommc.patch
@@ -357,7 +357,7 @@
 +      unsigned long data;
 +
 +      if (attr == &gpiommc_attr_register) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -378,7 +378,7 @@
 +      }
 +
 +      if (attr == &gpiommc_attr_DI) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -389,7 +389,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_DO) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -400,7 +400,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CLK) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -411,7 +411,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -422,7 +422,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS_activelow) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -433,7 +433,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spimode) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -457,7 +457,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spidelay) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -468,7 +468,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_max_bus_speed) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;

diff --git a/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch
index d4201eb50886e1e8f31ee0d4235d611b29e35afa..92815d91f4cdc001aa59e0277f74bc6421ad83c4 100644 (file)
--- a/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch
+++ b/target/linux/generic/patches-3.8/864-gpiommc_configfs_locking.patch
@@ -37,7 +37,7 @@ does not lock access between files.
 +      mutex_lock(&dev->mutex);
 +
        if (attr == &gpiommc_attr_register) {
-               err = strict_strtoul(page, 10, &data);
+               err = kstrtoul(page, 10, &data);
                if (err)
 @@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
        WARN_ON(1);

diff --git a/target/linux/generic/patches-3.9/863-gpiommc.patch b/target/linux/generic/patches-3.9/863-gpiommc.patch
index d431ad315410e42c6c5171cdd148ade941a3b076..8dd546d1b0be5ad39bd2287df3eaed75d81a42b1 100644 (file)
--- a/target/linux/generic/patches-3.9/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.9/863-gpiommc.patch
@@ -357,7 +357,7 @@
 +      unsigned long data;
 +
 +      if (attr == &gpiommc_attr_register) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -378,7 +378,7 @@
 +      }
 +
 +      if (attr == &gpiommc_attr_DI) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -389,7 +389,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_DO) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -400,7 +400,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CLK) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -411,7 +411,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -422,7 +422,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_CS_activelow) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -433,7 +433,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spimode) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -457,7 +457,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_spidelay) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;
@@ -468,7 +468,7 @@
 +              goto out;
 +      }
 +      if (attr == &gpiommc_attr_max_bus_speed) {
-+              err = strict_strtoul(page, 10, &data);
++              err = kstrtoul(page, 10, &data);
 +              if (err)
 +                      goto out;
 +              err = -EINVAL;

diff --git a/target/linux/generic/patches-3.9/864-gpiommc_configfs_locking.patch b/target/linux/generic/patches-3.9/864-gpiommc_configfs_locking.patch
index d4201eb50886e1e8f31ee0d4235d611b29e35afa..92815d91f4cdc001aa59e0277f74bc6421ad83c4 100644 (file)
--- a/target/linux/generic/patches-3.9/864-gpiommc_configfs_locking.patch
+++ b/target/linux/generic/patches-3.9/864-gpiommc_configfs_locking.patch
@@ -37,7 +37,7 @@ does not lock access between files.
 +      mutex_lock(&dev->mutex);
 +
        if (attr == &gpiommc_attr_register) {
-               err = strict_strtoul(page, 10, &data);
+               err = kstrtoul(page, 10, &data);
                if (err)
 @@ -478,6 +486,8 @@ static ssize_t gpiommc_config_attr_store
        WARN_ON(1);