diff mbox series

rtc: rv3029: Clean up error handling in rv3029_eeprom_write()

Message ID 20170920214530.jusyjbnvkopsumrr@mwanda
State Accepted
Headers show
Series rtc: rv3029: Clean up error handling in rv3029_eeprom_write() | expand

Commit Message

Dan Carpenter Sept. 20, 2017, 9:45 p.m. UTC 
We don't need both "ret" and "err" when they do the same thing.  All the
functions called here return zero on success or negative error codes.
It's more clear to return a literal zero at the end instead of
"return ret;"

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Alexandre Belloni Oct. 12, 2017, 2:40 p.m. UTC | #1 
On 21/09/2017 at 00:45:30 +0300, Dan Carpenter wrote:
> We don't need both "ret" and "err" when they do the same thing.  All the
> functions called here return zero on success or negative error codes.
> It's more clear to return a literal zero at the end instead of
> "return ret;"
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
Applied, thanks.
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index aa09771de04f..f4f957ab5fe6 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -282,13 +282,13 @@  static int rv3029_eeprom_read(struct device *dev, u8 reg,
 static int rv3029_eeprom_write(struct device *dev, u8 reg,
 			       u8 const buf[], size_t len)
 {
-	int ret, err;
+	int ret;
 	size_t i;
 	u8 tmp;
 
-	err = rv3029_eeprom_enter(dev);
-	if (err < 0)
-		return err;
+	ret = rv3029_eeprom_enter(dev);
+	if (ret < 0)
+		return ret;
 
 	for (i = 0; i < len; i++, reg++) {
 		ret = rv3029_read_regs(dev, reg, &tmp, 1);
@@ -304,11 +304,11 @@  static int rv3029_eeprom_write(struct device *dev, u8 reg,
 			break;
 	}
 
-	err = rv3029_eeprom_exit(dev);
-	if (err < 0)
-		return err;
+	ret = rv3029_eeprom_exit(dev);
+	if (ret < 0)
+		return ret;
 
-	return ret;
+	return 0;
 }
 
 static int rv3029_eeprom_update_bits(struct device *dev,