diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-03 18:07:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:08:00 -0400 |
commit | 4c5591c1eee54b7775ea63635ae310a29f0207bb (patch) | |
tree | 857ae91ec7fcd91927a21666a90060b6f0ac9f98 | |
parent | 0734e27f0befe9e88c2b5dad789b05b7bf86ce90 (diff) |
drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul()
The usage of strict_strtoul() is not preferred, because strict_strtoul()
is obsolete. Thus, kstrtoul() should be used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-pcf2123.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c index b2a78a02cf16..1725b5090e33 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c | |||
@@ -94,8 +94,9 @@ static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr, | |||
94 | 94 | ||
95 | r = container_of(attr, struct pcf2123_sysfs_reg, attr); | 95 | r = container_of(attr, struct pcf2123_sysfs_reg, attr); |
96 | 96 | ||
97 | if (strict_strtoul(r->name, 16, ®)) | 97 | ret = kstrtoul(r->name, 16, ®); |
98 | return -EINVAL; | 98 | if (ret) |
99 | return ret; | ||
99 | 100 | ||
100 | txbuf[0] = PCF2123_READ | reg; | 101 | txbuf[0] = PCF2123_READ | reg; |
101 | ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1); | 102 | ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1); |
@@ -117,9 +118,13 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr, | |||
117 | 118 | ||
118 | r = container_of(attr, struct pcf2123_sysfs_reg, attr); | 119 | r = container_of(attr, struct pcf2123_sysfs_reg, attr); |
119 | 120 | ||
120 | if (strict_strtoul(r->name, 16, ®) | 121 | ret = kstrtoul(r->name, 16, ®); |
121 | || strict_strtoul(buffer, 10, &val)) | 122 | if (ret) |
122 | return -EINVAL; | 123 | return ret; |
124 | |||
125 | ret = kstrtoul(buffer, 10, &val); | ||
126 | if (ret) | ||
127 | return ret; | ||
123 | 128 | ||
124 | txbuf[0] = PCF2123_WRITE | reg; | 129 | txbuf[0] = PCF2123_WRITE | reg; |
125 | txbuf[1] = val; | 130 | txbuf[1] = val; |