drivers/rtc/rtc-ds1302.c: handle write protection

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-pcf8583.c

diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 95886dcf4a39b6156d31c340d25c3bddb9ecf194..ab740cd631092a202cbdff938c2afa9f891e2db2 100644 (file)
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -188,7 +188,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;
        }
 
@@ -289,11 +290,6 @@ static int pcf8583_probe(struct i2c_client *client,
        return 0;
 }
 
-static int pcf8583_remove(struct i2c_client *client)
-{
-       return 0;
-}
-
 static const struct i2c_device_id pcf8583_id[] = {
        { "pcf8583", 0 },
        { }
@@ -306,7 +302,6 @@ static struct i2c_driver pcf8583_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = pcf8583_probe,
-       .remove         = pcf8583_remove,
        .id_table       = pcf8583_id,
 };