Merge tag 'ecryptfs-3.11-rc1-cleanup' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / rtc / rtc-pcf2123.c

diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index 796a6c5067dd58bc106f746f39e3b9f221838d97..1725b5090e33d1ea8a768c07f65302f0b61831d7 100644 (file)
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -18,11 +18,11 @@
  * should look something like:
  *
  * static struct spi_board_info ek_spi_devices[] = {
- *     ...
- *     {
- *             .modalias               = "rtc-pcf2123",
- *             .chip_select            = 1,
- *             .controller_data        = (void *)AT91_PIN_PA10,
+ *     ...
+ *     {
+ *             .modalias               = "rtc-pcf2123",
+ *             .chip_select            = 1,
+ *             .controller_data        = (void *)AT91_PIN_PA10,
  *             .max_speed_hz           = 1000 * 1000,
  *             .mode                   = SPI_CS_HIGH,
  *             .bus_num                = 0,
@@ -94,8 +94,9 @@ static ssize_t pcf2123_show(struct device *dev, struct device_attribute *attr,
 
        r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-       if (strict_strtoul(r->name, 16, &reg))
-               return -EINVAL;
+       ret = kstrtoul(r->name, 16, &reg);
+       if (ret)
+               return ret;
 
        txbuf[0] = PCF2123_READ | reg;
        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,
 
        r = container_of(attr, struct pcf2123_sysfs_reg, attr);
 
-       if (strict_strtoul(r->name, 16, &reg)
-               || strict_strtoul(buffer, 10, &val))
-               return -EINVAL;
+       ret = kstrtoul(r->name, 16, &reg);
+       if (ret)
+               return ret;
+
+       ret = kstrtoul(buffer, 10, &val);
+       if (ret)
+               return ret;
 
        txbuf[0] = PCF2123_WRITE | reg;
        txbuf[1] = val;