aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rts5208/rtsx_card.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-03-25 12:54:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 13:17:05 +0100
commit8ee775f92c8af2eb1626d39f06feac04fe0cb6e0 (patch)
tree99c4d76caa68351c18e18e39ed3e22975004ef2a /drivers/staging/rts5208/rtsx_card.h
parentstaging: rts5208: Remove TRACE_RET and TRACE_GOTO macros (diff)
downloadlinux-dev-8ee775f92c8af2eb1626d39f06feac04fe0cb6e0.tar.xz
linux-dev-8ee775f92c8af2eb1626d39f06feac04fe0cb6e0.zip
staging: rts5208: Remove RTSX_READ_REG and RTSX_WRITE_REG macros
Macros with hidden flow control are bad form as the code path taken can be unexpected for the reader. Expand these in-place and remove the macros. Done with coccinelle script: @@ expression chip; expression arg1; expression arg2; expression arg3; @@ - RTSX_WRITE_REG(chip, arg1, arg2, arg3); + retval = rtsx_write_register(chip, arg1, arg2, arg3); + if (retval) { + rtsx_trace(chip); + return retval; + } @@ expression chip; expression arg1; expression arg2; @@ - RTSX_READ_REG(chip, arg1, arg2); + retval = rtsx_read_register(chip, arg1, arg2); + if (retval) { + rtsx_trace(chip); + return retval; + } Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rts5208/rtsx_card.h')
-rw-r--r--drivers/staging/rts5208/rtsx_card.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/staging/rts5208/rtsx_card.h b/drivers/staging/rts5208/rtsx_card.h
index 75cf5889bda4..8f2cf9a4ec69 100644
--- a/drivers/staging/rts5208/rtsx_card.h
+++ b/drivers/staging/rts5208/rtsx_card.h
@@ -1061,7 +1061,13 @@ int card_power_off(struct rtsx_chip *chip, u8 card);
static inline int card_power_off_all(struct rtsx_chip *chip)
{
- RTSX_WRITE_REG(chip, CARD_PWR_CTL, 0x0F, 0x0F);
+ int retval;
+
+ retval = rtsx_write_register(chip, CARD_PWR_CTL, 0x0F, 0x0F);
+ if (retval) {
+ rtsx_trace(chip);
+ return retval;
+ }
return STATUS_SUCCESS;
}