Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645

[karo-tx-linux.git] / drivers / net / phy / spi_ks8995.c

diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 46530159256b3c8c09ad528caf38a5a7cfdb8295..f091d691cf6f1d1961f8e92d6107abdc7e9de9b0 100644 (file)
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -209,8 +209,6 @@ static int ks8995_reset(struct ks8995_switch *ks)
        return ks8995_start(ks);
 }
 
-/* ------------------------------------------------------------------------ */
-
 static ssize_t ks8995_registers_read(struct file *filp, struct kobject *kobj,
        struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)
 {
@@ -220,19 +218,9 @@ static ssize_t ks8995_registers_read(struct file *filp, struct kobject *kobj,
        dev = container_of(kobj, struct device, kobj);
        ks8995 = dev_get_drvdata(dev);
 
-       if (unlikely(off > ks8995->regs_attr.size))
-               return 0;
-
-       if ((off + count) > ks8995->regs_attr.size)
-               count = ks8995->regs_attr.size - off;
-
-       if (unlikely(!count))
-               return count;
-
        return ks8995_read(ks8995, buf, off, count);
 }
 
-
 static ssize_t ks8995_registers_write(struct file *filp, struct kobject *kobj,
        struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)
 {
@@ -242,19 +230,9 @@ static ssize_t ks8995_registers_write(struct file *filp, struct kobject *kobj,
        dev = container_of(kobj, struct device, kobj);
        ks8995 = dev_get_drvdata(dev);
 
-       if (unlikely(off >= ks8995->regs_attr.size))
-               return -EFBIG;
-
-       if ((off + count) > ks8995->regs_attr.size)
-               count = ks8995->regs_attr.size - off;
-
-       if (unlikely(!count))
-               return count;
-
        return ks8995_write(ks8995, buf, off, count);
 }
 
-
 static const struct bin_attribute ks8995_registers_attr = {
        .attr = {
                .name   = "registers",