ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE

Since we have defined DS2781_PARAM_EEPROM_SIZE and
DS2781_USER_EEPROM_SIZE, use them to simplify the code.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

1 files changed, 6 insertions, 14 deletions

diff --git a/drivers/power/ds2781_battery.c b/drivers/power/ds2781_battery.c
index ca0d653d0a7a..975684a40f15 100644
--- a/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@ -643,9 +643,7 @@ static ssize_t ds2781_read_param_eeprom_bin(struct file *filp,
         struct power_supply *psy = to_power_supply(dev);
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK1_END -
-                DS2781_EEPROM_BLOCK1_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_PARAM_EEPROM_SIZE - off);
 
         return ds2781_read_block(dev_info, buf,
                                 DS2781_EEPROM_BLOCK1_START + off, count);
@@ -661,9 +659,7 @@ static ssize_t ds2781_write_param_eeprom_bin(struct file *filp,
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
         int ret;
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK1_END -
-                DS2781_EEPROM_BLOCK1_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_PARAM_EEPROM_SIZE - off);
 
         ret = ds2781_write(dev_info, buf,
                                 DS2781_EEPROM_BLOCK1_START + off, count);
@@ -682,7 +678,7 @@ static struct bin_attribute ds2781_param_eeprom_bin_attr = {
                 .name = "param_eeprom",
                 .mode = S_IRUGO | S_IWUSR,
         },
-        .size = DS2781_EEPROM_BLOCK1_END - DS2781_EEPROM_BLOCK1_START + 1,
+        .size = DS2781_PARAM_EEPROM_SIZE,
         .read = ds2781_read_param_eeprom_bin,
         .write = ds2781_write_param_eeprom_bin,
 };
@@ -696,9 +692,7 @@ static ssize_t ds2781_read_user_eeprom_bin(struct file *filp,
         struct power_supply *psy = to_power_supply(dev);
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK0_END -
-                DS2781_EEPROM_BLOCK0_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_USER_EEPROM_SIZE - off);
 
         return ds2781_read_block(dev_info, buf,
                                 DS2781_EEPROM_BLOCK0_START + off, count);
@@ -715,9 +709,7 @@ static ssize_t ds2781_write_user_eeprom_bin(struct file *filp,
         struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
         int ret;
 
-        count = min_t(loff_t, count,
-                DS2781_EEPROM_BLOCK0_END -
-                DS2781_EEPROM_BLOCK0_START + 1 - off);
+        count = min_t(loff_t, count, DS2781_USER_EEPROM_SIZE - off);
 
         ret = ds2781_write(dev_info, buf,
                                 DS2781_EEPROM_BLOCK0_START + off, count);
@@ -736,7 +728,7 @@ static struct bin_attribute ds2781_user_eeprom_bin_attr = {
                 .name = "user_eeprom",
                 .mode = S_IRUGO | S_IWUSR,
         },
-        .size = DS2781_EEPROM_BLOCK0_END - DS2781_EEPROM_BLOCK0_START + 1,
+        .size = DS2781_USER_EEPROM_SIZE,
         .read = ds2781_read_user_eeprom_bin,
         .write = ds2781_write_user_eeprom_bin,
 };