rtc: rx8010: rename ret to err in rx8010_set_time()
authorBartosz Golaszewski <bgolaszewski@baylibre.com>
Mon, 14 Sep 2020 15:45:53 +0000 (17:45 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 15 Sep 2020 08:50:37 +0000 (10:50 +0200)
All other functions in this driver use 'err' for integer return values.
Do the same in rx8010_set_time() for consistency.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200914154601.32245-7-brgl@bgdev.pl
drivers/rtc/rtc-rx8010.c

index 51ac4fac8f196c4e648cfb443376c21d8fedfe66..300314ab7b6de9d297a39cb90a8b52c2d7963a7b 100644 (file)
@@ -140,7 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
 {
        struct rx8010_data *rx8010 = dev_get_drvdata(dev);
        u8 date[7];
-       int ctrl, flagreg, ret;
+       int ctrl, flagreg, err;
 
        if ((dt->tm_year < 100) || (dt->tm_year > 199))
                return -EINVAL;
@@ -150,10 +150,10 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
        if (ctrl < 0)
                return ctrl;
        rx8010->ctrlreg = ctrl | RX8010_CTRL_STOP;
-       ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL,
+       err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL,
                                        rx8010->ctrlreg);
-       if (ret < 0)
-               return ret;
+       if (err < 0)
+               return err;
 
        date[RX8010_SEC - RX8010_SEC] = bin2bcd(dt->tm_sec);
        date[RX8010_MIN - RX8010_SEC] = bin2bcd(dt->tm_min);
@@ -163,27 +163,27 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
        date[RX8010_YEAR - RX8010_SEC] = bin2bcd(dt->tm_year - 100);
        date[RX8010_WDAY - RX8010_SEC] = bin2bcd(1 << dt->tm_wday);
 
-       ret = i2c_smbus_write_i2c_block_data(rx8010->client,
+       err = i2c_smbus_write_i2c_block_data(rx8010->client,
                                             RX8010_SEC, 7, date);
-       if (ret < 0)
-               return ret;
+       if (err < 0)
+               return err;
 
        /* clear STOP bit after changing clock/calendar */
        ctrl = i2c_smbus_read_byte_data(rx8010->client, RX8010_CTRL);
        if (ctrl < 0)
                return ctrl;
        rx8010->ctrlreg = ctrl & ~RX8010_CTRL_STOP;
-       ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL,
+       err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL,
                                        rx8010->ctrlreg);
-       if (ret < 0)
-               return ret;
+       if (err < 0)
+               return err;
 
        flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG);
        if (flagreg < 0)
                return flagreg;
 
        if (flagreg & RX8010_FLAG_VLF)
-               ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG,
+               err = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG,
                                                flagreg & ~RX8010_FLAG_VLF);
 
        return 0;