summaryrefslogtreecommitdiff
path: root/drivers/staging/rts5139
diff options
context:
space:
mode:
authorAdnan Ali <adnan.ali@codethink.co.uk>2012-05-29 18:21:20 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-12 21:34:47 +0400
commitdee0dc0d0649b028e16473a8e2410efd455135c2 (patch)
tree5bada38f4cd301e04f00422acf2bdc7d467a3913 /drivers/staging/rts5139
parentff5e4a1d2702582614996f6f6d005e9b5caadeb8 (diff)
downloadlinux-dee0dc0d0649b028e16473a8e2410efd455135c2.tar.xz
Staging: rts5139: sd_cprm: fix coding style and deprecation issues
This commit fixes coding style and deprecation issues which includes long lines, braces with single statments in if condition and deprecated min() function. Signed-off-by: Adnan Ali <adnan.ali@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rts5139')
-rw-r--r--drivers/staging/rts5139/sd_cprm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rts5139/sd_cprm.c b/drivers/staging/rts5139/sd_cprm.c
index f8c60711f710..0167f7f35c20 100644
--- a/drivers/staging/rts5139/sd_cprm.c
+++ b/drivers/staging/rts5139/sd_cprm.c
@@ -201,9 +201,8 @@ RTY_SEND_CMD:
if (buf[1] & 0x80)
TRACE_RET(chip, STATUS_FAIL);
}
- if (buf[1] & 0x7F) {
+ if (buf[1] & 0x7F)
TRACE_RET(chip, STATUS_FAIL);
- }
if (buf[2] & 0xF8)
TRACE_RET(chip, STATUS_FAIL);
@@ -224,7 +223,8 @@ RTY_SEND_CMD:
return STATUS_SUCCESS;
}
-static int ext_sd_get_rsp(struct rts51x_chip *chip, int len, u8 *rsp, u8 rsp_type)
+static int ext_sd_get_rsp(struct rts51x_chip *chip, int len,
+ u8 *rsp, u8 rsp_type)
{
int retval, rsp_len;
u16 reg_addr;
@@ -844,7 +844,7 @@ int sd_pass_thru_mode(struct scsi_cmnd *srb, struct rts51x_chip *chip)
buf[15] = chip->max_lun;
- len = min(18, (int)scsi_bufflen(srb));
+ len = min_t(unsigned, 18, scsi_bufflen(srb));
rts51x_set_xfer_buf(buf, len, srb);
return TRANSPORT_GOOD;