]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtc: pcf8563: remove leftover code
authorJan Kardell <jan.kardell@telliq.com>
Wed, 10 Dec 2014 23:53:31 +0000 (15:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 01:41:14 +0000 (17:41 -0800)
Remove some code that was left from before block read/write was used.

Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Vincent Donnefort <vdonnefort@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-pcf8563.c

index c2ef0a22ee94639a0db6d3f1e0334d26947059cb..1a865c9f11277eca91d6992262259f8495346928 100644 (file)
@@ -118,22 +118,21 @@ static int pcf8563_write_block_data(struct i2c_client *client,
 
 static int pcf8563_set_alarm_mode(struct i2c_client *client, bool on)
 {
-       unsigned char buf[2];
+       unsigned char buf;
        int err;
 
-       err = pcf8563_read_block_data(client, PCF8563_REG_ST2, 1, buf + 1);
+       err = pcf8563_read_block_data(client, PCF8563_REG_ST2, 1, &buf);
        if (err < 0)
                return err;
 
        if (on)
-               buf[1] |= PCF8563_BIT_AIE;
+               buf |= PCF8563_BIT_AIE;
        else
-               buf[1] &= ~PCF8563_BIT_AIE;
+               buf &= ~PCF8563_BIT_AIE;
 
-       buf[1] &= ~PCF8563_BIT_AF;
-       buf[0] = PCF8563_REG_ST2;
+       buf &= ~PCF8563_BIT_AF;
 
-       err = pcf8563_write_block_data(client, PCF8563_REG_ST2, 1, buf + 1);
+       err = pcf8563_write_block_data(client, PCF8563_REG_ST2, 1, &buf);
        if (err < 0) {
                dev_err(&client->dev, "%s: write error\n", __func__);
                return -EIO;