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

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

drivers/rtc/rtc-rx8010.c

+11 −11
Original line number Diff line number Diff line
@@ -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;