Browse Source

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

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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Dan Carpenter 7 years ago
parent
commit
97f5b0379c
1 changed files with 8 additions and 8 deletions
  1. 8 8
      drivers/rtc/rtc-rv3029c2.c

+ 8 - 8
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,
 static int rv3029_eeprom_write(struct device *dev, u8 reg,
 			       u8 const buf[], size_t len)
 			       u8 const buf[], size_t len)
 {
 {
-	int ret, err;
+	int ret;
 	size_t i;
 	size_t i;
 	u8 tmp;
 	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++) {
 	for (i = 0; i < len; i++, reg++) {
 		ret = rv3029_read_regs(dev, reg, &tmp, 1);
 		ret = rv3029_read_regs(dev, reg, &tmp, 1);
@@ -304,11 +304,11 @@ static int rv3029_eeprom_write(struct device *dev, u8 reg,
 			break;
 			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,
 static int rv3029_eeprom_update_bits(struct device *dev,