From: Andrew Morton Cc: Raphael Assenat Cc: Alessandro Zummo Signed-off-by: Andrew Morton --- drivers/rtc/rtc-v3020.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff -puN drivers/rtc/rtc-v3020.c~add-v3020-rtc-support-tidy drivers/rtc/rtc-v3020.c --- devel/drivers/rtc/rtc-v3020.c~add-v3020-rtc-support-tidy 2006-06-06 16:03:45.000000000 -0700 +++ devel-akpm/drivers/rtc/rtc-v3020.c 2006-06-06 16:03:45.000000000 -0700 @@ -37,22 +37,22 @@ struct v3020 { struct rtc_device *rtc; }; -static void v3020_set_reg(struct v3020 *chip, unsigned char address, unsigned char data) +static void v3020_set_reg(struct v3020 *chip, unsigned char address, + unsigned char data) { int i; unsigned char tmp; tmp = address; - for (i=0; i<4; i++) { - writel( (tmp & 1) << chip->leftshift , chip->ioaddress); + for (i = 0; i < 4; i++) { + writel((tmp & 1) << chip->leftshift, chip->ioaddress); tmp >>= 1; } /* Commands dont have data */ - if (!V3020_IS_COMMAND(address)) - { - for (i=0; i<8; i++) { - writel( (data & 1) << chip->leftshift, chip->ioaddress); + if (!V3020_IS_COMMAND(address)) { + for (i = 0; i < 8; i++) { + writel((data & 1) << chip->leftshift, chip->ioaddress); data >>= 1; } } @@ -63,16 +63,15 @@ static unsigned char v3020_get_reg(struc unsigned int data=0; int i; - for (i=0; i<4; i++) { - writel((address & 1) << chip->leftshift , chip->ioaddress); + for (i = 0; i < 4; i++) { + writel((address & 1) << chip->leftshift, chip->ioaddress); address >>= 1; } - for (i=0; i<8; i++) { + for (i = 0; i < 8; i++) { data >>= 1; - if (readl(chip->ioaddress) & (1 << chip->leftshift)) { + if (readl(chip->ioaddress) & (1 << chip->leftshift)) data |= 0x80; - } } return data; @@ -184,7 +183,7 @@ static int rtc_probe(struct platform_dev /* Make sure the v3020 expects a communication cycle * by reading 8 times */ - for(i=0;i<8;i++) + for (i = 0; i < 8; i++) temp = readl(chip->ioaddress); /* Test chip by doing a write/read sequence @@ -214,7 +213,6 @@ static int rtc_probe(struct platform_dev } chip->rtc = rtc; - return 0; err_io: _