Commit 13952c9e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Alexandre Belloni

rtc: rx8010: rename ret to err in rx8010_set_time()

All other functions in this driver use 'err' for integer return values.
Do the same in rx8010_set_time() for consistency.
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200914154601.32245-7-brgl@bgdev.pl
parent e9e4c2da
...@@ -140,7 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) ...@@ -140,7 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
{ {
struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev);
u8 date[7]; u8 date[7];
int ctrl, flagreg, ret; int ctrl, flagreg, err;
if ((dt->tm_year < 100) || (dt->tm_year > 199)) if ((dt->tm_year < 100) || (dt->tm_year > 199))
return -EINVAL; return -EINVAL;
...@@ -150,10 +150,10 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) ...@@ -150,10 +150,10 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt)
if (ctrl < 0) if (ctrl < 0)
return ctrl; return ctrl;
rx8010->ctrlreg = ctrl | RX8010_CTRL_STOP; 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); rx8010->ctrlreg);
if (ret < 0) if (err < 0)
return ret; return err;
date[RX8010_SEC - RX8010_SEC] = bin2bcd(dt->tm_sec); date[RX8010_SEC - RX8010_SEC] = bin2bcd(dt->tm_sec);
date[RX8010_MIN - RX8010_SEC] = bin2bcd(dt->tm_min); 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) ...@@ -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_YEAR - RX8010_SEC] = bin2bcd(dt->tm_year - 100);
date[RX8010_WDAY - RX8010_SEC] = bin2bcd(1 << dt->tm_wday); 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); RX8010_SEC, 7, date);
if (ret < 0) if (err < 0)
return ret; return err;
/* clear STOP bit after changing clock/calendar */ /* clear STOP bit after changing clock/calendar */
ctrl = i2c_smbus_read_byte_data(rx8010->client, RX8010_CTRL); ctrl = i2c_smbus_read_byte_data(rx8010->client, RX8010_CTRL);
if (ctrl < 0) if (ctrl < 0)
return ctrl; return ctrl;
rx8010->ctrlreg = ctrl & ~RX8010_CTRL_STOP; 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); rx8010->ctrlreg);
if (ret < 0) if (err < 0)
return ret; return err;
flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG);
if (flagreg < 0) if (flagreg < 0)
return flagreg; return flagreg;
if (flagreg & RX8010_FLAG_VLF) 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); flagreg & ~RX8010_FLAG_VLF);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment