]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
rtc: ds1307: clean up ds1307_nvram_read()/ds1307_nvram_write()
authorVladimir Zapolskiy <vz@mleia.com>
Sun, 26 Jul 2015 21:48:28 +0000 (00:48 +0300)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Sat, 5 Sep 2015 11:19:10 +0000 (13:19 +0200)
The change removes redundant sysfs binary file boundary checks, since
this task is already done on caller side in fs/sysfs/file.c

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-ds1307.c

index c51bc0a65afce4ca093a7184dc9a9b6cfe198abb..a705e6490808f277e21102bf208a5e77c1d35bb1 100644 (file)
@@ -782,13 +782,6 @@ ds1307_nvram_read(struct file *filp, struct kobject *kobj,
        client = kobj_to_i2c_client(kobj);
        ds1307 = i2c_get_clientdata(client);
 
-       if (unlikely(off >= ds1307->nvram->size))
-               return 0;
-       if ((off + count) > ds1307->nvram->size)
-               count = ds1307->nvram->size - off;
-       if (unlikely(!count))
-               return count;
-
        result = ds1307->read_block_data(client, ds1307->nvram_offset + off,
                                                                count, buf);
        if (result < 0)
@@ -808,13 +801,6 @@ ds1307_nvram_write(struct file *filp, struct kobject *kobj,
        client = kobj_to_i2c_client(kobj);
        ds1307 = i2c_get_clientdata(client);
 
-       if (unlikely(off >= ds1307->nvram->size))
-               return -EFBIG;
-       if ((off + count) > ds1307->nvram->size)
-               count = ds1307->nvram->size - off;
-       if (unlikely(!count))
-               return count;
-
        result = ds1307->write_block_data(client, ds1307->nvram_offset + off,
                                                                count, buf);
        if (result < 0) {