Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 95886dcf4a39b6156d31c340d25c3bddb9ecf194..843a745c42f34adeef54b1c79ffa7146e5943f4a 100644 (file)
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/rtc.h>
 #include <linux/init.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/bcd.h>
 
@@ -188,7 +189,8 @@ static int pcf8583_rtc_read_time(struct device *dev, struct rtc_time *tm)
                dev_warn(dev, "resetting control %02x -> %02x\n",
                        ctrl, new_ctrl);
 
-               if ((err = pcf8583_set_ctrl(client, &new_ctrl)) < 0)
+               err = pcf8583_set_ctrl(client, &new_ctrl);
+               if (err < 0)
                        return err;
        }
 
@@ -283,15 +285,7 @@ static int pcf8583_probe(struct i2c_client *client,
                                pcf8583_driver.driver.name,
                                &pcf8583_rtc_ops, THIS_MODULE);
 
-       if (IS_ERR(pcf8583->rtc))
-               return PTR_ERR(pcf8583->rtc);
-
-       return 0;
-}
-
-static int pcf8583_remove(struct i2c_client *client)
-{
-       return 0;
+       return PTR_RET(pcf8583->rtc);
 }
 
 static const struct i2c_device_id pcf8583_id[] = {
@@ -306,7 +300,6 @@ static struct i2c_driver pcf8583_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = pcf8583_probe,
-       .remove         = pcf8583_remove,
        .id_table       = pcf8583_id,
 };