summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-max6902.c
diff options
context:
space:
mode:
authorMarc Pignat <marc.pignat@hevs.ch>2007-12-05 10:45:11 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 20:21:19 +0300
commitc24b2602af88db4489c6c3fb4b2a8e47fb15769b (patch)
treed27731d5534fde61c17f3cd273ce0e639e3ff2cf /drivers/rtc/rtc-max6902.c
parent9b938b749065d6a94172ac24d9748bd66a03da4c (diff)
downloadlinux-c24b2602af88db4489c6c3fb4b2a8e47fb15769b.tar.xz
spi: use simplified spi_sync() calling convention
Given the patch which simplifies the spi_sync calling convention, this one updates the callers of that routine which tried using it according to the previous specification. (Most didn't.) Signed-off-by: Marc Pignat <marc.pignat@hevs.ch> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-max6902.c')
-rw-r--r--drivers/rtc/rtc-max6902.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 3e183cfee10f..1f956dc5d56e 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -89,13 +89,9 @@ static int max6902_get_reg(struct device *dev, unsigned char address,
/* do the i/o */
status = spi_sync(spi, &message);
- if (status == 0)
- status = message.status;
- else
- return status;
-
- *data = chip->rx_buf[1];
+ if (status == 0)
+ *data = chip->rx_buf[1];
return status;
}
@@ -125,9 +121,7 @@ static int max6902_get_datetime(struct device *dev, struct rtc_time *dt)
/* do the i/o */
status = spi_sync(spi, &message);
- if (status == 0)
- status = message.status;
- else
+ if (status)
return status;
/* The chip sends data in this order: