diff options
Diffstat (limited to 'drivers/staging/rts5139')
| -rw-r--r-- | drivers/staging/rts5139/ms.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rts5139/rts51x.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rts5139/rts51x_card.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rts5139/rts51x_card.h | 8 | ||||
| -rw-r--r-- | drivers/staging/rts5139/rts51x_scsi.c | 1 |
5 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/rts5139/ms.c b/drivers/staging/rts5139/ms.c index a27f7e224e03..9253f6ab2e08 100644 --- a/drivers/staging/rts5139/ms.c +++ b/drivers/staging/rts5139/ms.c @@ -48,7 +48,7 @@ static inline int ms_check_err_code(struct rts51x_chip *chip, u8 err_code) { struct ms_info *ms_card = &(chip->ms_card); - return (ms_card->err_code == err_code); + return ms_card->err_code == err_code; } static int ms_parse_err_code(struct rts51x_chip *chip) diff --git a/drivers/staging/rts5139/rts51x.c b/drivers/staging/rts5139/rts51x.c index 04213463123e..a8d2d046b44f 100644 --- a/drivers/staging/rts5139/rts51x.c +++ b/drivers/staging/rts5139/rts51x.c @@ -30,7 +30,6 @@ #include <linux/errno.h> #include <linux/freezer.h> #include <linux/module.h> -#include <linux/init.h> #include <linux/slab.h> #include <linux/mutex.h> #include <linux/utsname.h> diff --git a/drivers/staging/rts5139/rts51x_card.c b/drivers/staging/rts5139/rts51x_card.c index 509d83e623a5..03456d9873e5 100644 --- a/drivers/staging/rts5139/rts51x_card.c +++ b/drivers/staging/rts5139/rts51x_card.c @@ -373,7 +373,7 @@ void rts51x_release_cards(struct rts51x_chip *chip) static inline u8 double_depth(u8 depth) { - return ((depth > 1) ? (depth - 1) : depth); + return (depth > 1) ? (depth - 1) : depth; } int rts51x_switch_ssc_clock(struct rts51x_chip *chip, int clk) @@ -653,8 +653,8 @@ int rts51x_switch_normal_clock(struct rts51x_chip *chip, int clk) return STATUS_SUCCESS; } -int rts51x_card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr, - u16 sec_cnt) +int rts51x_card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, + u32 sec_addr, u16 sec_cnt) { int retval; unsigned int lun = SCSI_LUN(srb); @@ -770,8 +770,8 @@ void rts51x_eject_card(struct rts51x_chip *chip, unsigned int lun) XD_INT | MS_INT | SD_INT); } -void rts51x_trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip, - u32 byte_cnt, u8 pack_size) +void rts51x_trans_dma_enable(enum dma_data_direction dir, + struct rts51x_chip *chip, u32 byte_cnt, u8 pack_size) { if (pack_size > DMA_1024) pack_size = DMA_512; diff --git a/drivers/staging/rts5139/rts51x_card.h b/drivers/staging/rts5139/rts51x_card.h index e62b25c31413..df8816e0f840 100644 --- a/drivers/staging/rts5139/rts51x_card.h +++ b/drivers/staging/rts5139/rts51x_card.h @@ -743,13 +743,13 @@ void rts51x_init_cards(struct rts51x_chip *chip); void rts51x_release_cards(struct rts51x_chip *chip); int rts51x_switch_ssc_clock(struct rts51x_chip *chip, int clk); int rts51x_switch_normal_clock(struct rts51x_chip *chip, int clk); -int rts51x_card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr, - u16 sec_cnt); +int rts51x_card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, + u32 sec_addr, u16 sec_cnt); u8 rts51x_get_lun_card(struct rts51x_chip *chip, unsigned int lun); int rts51x_select_card(struct rts51x_chip *chip, int card); void rts51x_eject_card(struct rts51x_chip *chip, unsigned int lun); -void rts51x_trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip, - u32 byte_cnt, u8 pack_size); +void rts51x_trans_dma_enable(enum dma_data_direction dir, + struct rts51x_chip *chip, u32 byte_cnt, u8 pack_size); int rts51x_enable_card_clock(struct rts51x_chip *chip, u8 card); int rts51x_card_power_on(struct rts51x_chip *chip, u8 card); int rts51x_toggle_gpio(struct rts51x_chip *chip, u8 gpio); diff --git a/drivers/staging/rts5139/rts51x_scsi.c b/drivers/staging/rts5139/rts51x_scsi.c index a474eede70a3..3a990253c780 100644 --- a/drivers/staging/rts5139/rts51x_scsi.c +++ b/drivers/staging/rts5139/rts51x_scsi.c @@ -1985,7 +1985,6 @@ static int show_info(struct seq_file *m, struct Scsi_Host *host) SPRINTF(" Vendor: Realtek Corp.\n"); SPRINTF(" Product: RTS51xx USB Card Reader\n"); SPRINTF(" Version: %s\n", DRIVER_VERSION); - SPRINTF(" Build: %s\n", __TIME__); return 0; } |