[PATCH 38/45] kstrtox: convert drivers/rtc/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Alexey Dobriyan
Date: Sunday, December 5, 2010 - 10:49 am

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
 drivers/rtc/rtc-pcf2123.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index 71bab0e..9e08179 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -87,13 +87,14 @@ static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
 	struct spi_device *spi = to_spi_device(dev);
 	struct pcf2123_sysfs_reg *r;
 	u8 txbuf[1], rxbuf[1];
-	unsigned long reg;
+	u8 reg;
 	int ret;
 
 	r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-	if (strict_strtoul(r->name, 16, &reg))
-		return -EINVAL;
+	ret = kstrtou8(r->name, 16, &reg);
+	if (ret < 0)
+		return ret;
 
 	txbuf[0] = PCF2123_READ | reg;
 	ret = spi_write_then_read(spi, txbuf, 1, rxbuf, 1);
@@ -108,19 +109,17 @@ static ssize_t pcf2123_store(struct device *dev, struct device_attribute *attr,
 	struct spi_device *spi = to_spi_device(dev);
 	struct pcf2123_sysfs_reg *r;
 	u8 txbuf[2];
-	unsigned long reg;
-	unsigned long val;
-
 	int ret;
 
 	r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-	if (strict_strtoul(r->name, 16, &reg)
-		|| strict_strtoul(buffer, 10, &val))
-		return -EINVAL;
-
-	txbuf[0] = PCF2123_WRITE | reg;
-	txbuf[1] = val;
+	ret = kstrtou8(r->name, 16, &txbuf[0]);
+	if (ret < 0)
+		return ret;
+	txbuf[0] |= PCF2123_WRITE;
+	ret = kstrtou8(buffer, 10, &txbuf[1]);
+	if (ret < 0)
+		return ret;
 	ret = spi_write(spi, txbuf, sizeof(txbuf));
 	if (ret < 0)
 		return -EIO;
-- 
1.7.2.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 02/45] kstrtox: convert arch/x86/, Alexey Dobriyan, (Sun Dec 5, 10:48 am)
[PATCH 03/45] kstrtox: convert arch/arm/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 04/45] kstrtox: convert kernel/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 05/45] kstrtox: kernel/trace/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 06/45] kstrtox: convert mm/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 07/45] kstrtox: convert fs/fuse/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 08/45] kstrtox: convert fs/nfs/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 09/45] kstrtox: convert fs/proc/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 10/45] kstrtox: convert security/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 11/45] kstrtox: convert block/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 12/45] kstrtox: convert drivers/acpi/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 13/45] kstrtox: convert drivers/ata/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 14/45] kstrtox: convert drivers/base/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 15/45] kstrtox: convert drivers/block/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 16/45] kstrtox: convert drivers/bluetooth/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 17/45] kstrtox: convert drivers/clocksource/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 18/45] kstrtox: convert drivers/edac/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 19/45] kstrtox: convert drivers/gpio/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 20/45] kstrtox: convert drivers/gpu/drm/nouveau/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 21/45] kstrtox: convert drivers/hid/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 22/45] kstrtox: convert drivers/hwmon/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 23/45] kstrtox: convert drivers/ide/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 24/45] kstrtox: convert drivers/infiniband/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 25/45] kstrtox: convert drivers/input/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 26/45] kstrtox: convert drivers/isdn/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 27/45] kstrtox: convert drivers/leds/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 28/45] kstrtox: convert drivers/md/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 29/45] kstrtox: convert drivers/mfd/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 30/45] kstrtox: convert drivers/misc/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 31/45] kstrtox: convert drivers/mmc/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 32/45] kstrtox: convert drivers/net/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 33/45] kstrtox: convert drivers/net/wireless/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 34/45] kstrtox: convert drivers/pci/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 35/45] kstrtox: convert drivers/platform/x86/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 36/45] kstrtox: convert drivers/power/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 37/45] kstrtox: convert drivers/regulator/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 38/45] kstrtox: convert drivers/rtc/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 39/45] kstrtox: convert drivers/scsi/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 40/45] kstrtox: convert drivers/ssb/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 41/45] kstrtox: convert drivers/usb/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 42/45] kstrtox: convert drivers/video/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 43/45] kstrtox: convert drivers/w1/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 44/45] kstrtox: convert sound/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
[PATCH 45/45] kstrtox: convert net/, Alexey Dobriyan, (Sun Dec 5, 10:49 am)
Re: [PATCH 26/45] kstrtox: convert drivers/isdn/, Tilman Schmidt, (Sun Dec 5, 5:10 pm)
Re: [PATCH 26/45] kstrtox: convert drivers/isdn/, Alexey Dobriyan, (Mon Dec 6, 1:10 pm)
Re: [PATCH 26/45] kstrtox: convert drivers/isdn/, Tilman Schmidt, (Tue Dec 7, 3:06 am)