From: Morgan Creekmore Date: Sun, 12 Jan 2014 18:50:12 +0000 (-0700) Subject: Staging: rts5139: rts51x_card: fixed style issues X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f83471878c318669c2f5a933895241ad21d76661;p=deliverable%2Flinux.git Staging: rts5139: rts51x_card: fixed style issues fixed coding style issues, long lines and extra parentheses on return statement Signed-off-by: Morgan Creekmore Signed-off-by: Greg Kroah-Hartman --- 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);