diff options
| author | John Crispin <john@openwrt.org> | 2013-07-27 09:23:18 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-07-27 09:23:18 +0000 |
| commit | 4176b6fdd30011a1b86fd14a2211b6e8a15d6140 (patch) | |
| tree | 8eae5a3183396087f28700ab643b0fda780dce2a /target/linux/generic/patches-3.10 | |
| parent | c4413b6e080904c76cea4ee1fe551cc5406407ca (diff) | |
| download | upstream-4176b6fdd30011a1b86fd14a2211b6e8a15d6140.tar.gz upstream-4176b6fdd30011a1b86fd14a2211b6e8a15d6140.tar.bz2 upstream-4176b6fdd30011a1b86fd14a2211b6e8a15d6140.zip | |
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
Diffstat (limited to 'target/linux/generic/patches-3.10')
| -rw-r--r-- | target/linux/generic/patches-3.10/863-gpiommc.patch | 18 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.10/864-gpiommc_configfs_locking.patch | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.10/863-gpiommc.patch b/target/linux/generic/patches-3.10/863-gpiommc.patch index a9101f473b..00f7c8d2ec 100644 --- 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 d4201eb508..92815d91f4 100644 --- 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); |