From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 4/8] rtc: rx8010: rename ret to err in rx8010_set_time()
Date: Fri, 4 Sep 2020 17:21:12 +0200 [thread overview]
Message-ID: <20200904152116.2157-5-brgl@bgdev.pl> (raw)
In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
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>
---
drivers/rtc/rtc-rx8010.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c
index 2038700a3e8e..67ff06a76629 100644
--- a/drivers/rtc/rtc-rx8010.c
+++ b/drivers/rtc/rtc-rx8010.c
@@ -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;
--
2.26.1
next prev parent reply other threads:[~2020-09-04 15:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 15:21 [PATCH 0/8] rtc: rx8010: use regmap instead of i2c smbus API Bartosz Golaszewski
2020-09-04 15:21 ` [PATCH 1/8] rtc: rx8010: remove unnecessary parentheses Bartosz Golaszewski
2020-09-04 15:32 ` Alexandre Belloni
2020-09-04 15:21 ` [PATCH 2/8] rtc: rx8010: consolidate local variables of the same type Bartosz Golaszewski
2020-09-04 15:21 ` [PATCH 3/8] rtc: rx8010: use tabs for instead of spaces for code formatting Bartosz Golaszewski
2020-09-04 15:21 ` Bartosz Golaszewski [this message]
2020-09-04 15:21 ` [PATCH 5/8] rtc: rx8010: don't use magic values for time buffer length Bartosz Golaszewski
2020-09-04 15:39 ` Alexandre Belloni
2020-09-04 15:21 ` [PATCH 6/8] rtc: rx8010: drop unnecessary initialization Bartosz Golaszewski
2020-09-04 15:21 ` [PATCH 7/8] rtc: rx8010: fix indentation in probe() Bartosz Golaszewski
2020-09-04 15:41 ` Alexandre Belloni
2020-09-07 9:34 ` Bartosz Golaszewski
2020-09-11 12:28 ` Alexandre Belloni
2020-09-11 12:33 ` Bartosz Golaszewski
2020-09-11 12:44 ` Alexandre Belloni
2020-09-04 15:21 ` [PATCH 8/8] rtc: rx8010: convert to using regmap Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200904152116.2157-5-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=bgolaszewski@baylibre.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).