UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: rts5208: fix double blank line coding style issues 

This is a patch for double blank lines and a missing blank line reported
by checkpatch.pl

Signed-off-by: Jonas Rickert <jrickertkc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jonas Rickert 2016-07-30 13:27:58 +02:00 committed by Greg Kroah-Hartman
parent 22274c15e2
commit d5b7d2b02c
11 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/rts5208/ms.c
View File

@ -1417,7 +1417,6 @@ static int ms_read_status_reg(struct rtsx_chip *chip)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int ms_read_extra_data(struct rtsx_chip *chip, static int ms_read_extra_data(struct rtsx_chip *chip,
u16 block_addr, u8 page_num, u8 *buf, int buf_len) u16 block_addr, u8 page_num, u8 *buf, int buf_len)
{ {
@ -1582,7 +1581,6 @@ static int ms_write_extra_data(struct rtsx_chip *chip,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;
@ -1667,7 +1665,6 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk) static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;
@ -1738,7 +1735,6 @@ static int ms_set_bad_block(struct rtsx_chip *chip, u16 phy_blk)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk) static int ms_erase_block(struct rtsx_chip *chip, u16 phy_blk)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;
@ -1808,7 +1804,6 @@ ERASE_RTY:
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static void ms_set_page_status(u16 log_blk, u8 type, u8 *extra, int extra_len) static void ms_set_page_status(u16 log_blk, u8 type, u8 *extra, int extra_len)
{ {
if (!extra || (extra_len < MS_EXTRA_SIZE)) if (!extra || (extra_len < MS_EXTRA_SIZE))
@ -2152,7 +2147,6 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int reset_ms(struct rtsx_chip *chip) static int reset_ms(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;
@ -2809,7 +2803,6 @@ BUILD_FAIL:
return STATUS_FAIL; return STATUS_FAIL;
} }
int reset_ms_card(struct rtsx_chip *chip) int reset_ms_card(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;
@ -2896,7 +2889,6 @@ static int mspro_set_rw_cmd(struct rtsx_chip *chip,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
void mspro_stop_seq_mode(struct rtsx_chip *chip) void mspro_stop_seq_mode(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;
@ -3312,7 +3304,6 @@ int mspro_format(struct scsi_cmnd *srb, struct rtsx_chip *chip,
return STATUS_FAIL; return STATUS_FAIL;
} }
static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk, static int ms_read_multiple_pages(struct rtsx_chip *chip, u16 phy_blk,
u16 log_blk, u8 start_page, u8 end_page, u16 log_blk, u8 start_page, u8 end_page,
u8 *buf, unsigned int *index, u8 *buf, unsigned int *index,
@ -3719,7 +3710,6 @@ static int ms_write_multiple_pages(struct rtsx_chip *chip, u16 old_blk,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, static int ms_finish_write(struct rtsx_chip *chip, u16 old_blk, u16 new_blk,
u16 log_blk, u8 page_off) u16 log_blk, u8 page_off)
{ {
@ -4082,7 +4072,6 @@ int ms_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
return retval; return retval;
} }
void ms_free_l2p_tbl(struct rtsx_chip *chip) void ms_free_l2p_tbl(struct rtsx_chip *chip)
{ {
struct ms_info *ms_card = &chip->ms_card; struct ms_info *ms_card = &chip->ms_card;

1
drivers/staging/rts5208/ms.h
View File

@ -125,7 +125,6 @@
#define Pro_CatagoryReg 0x06 #define Pro_CatagoryReg 0x06
#define Pro_ClassReg 0x07 #define Pro_ClassReg 0x07
#define Pro_SystemParm 0x10 #define Pro_SystemParm 0x10
#define Pro_DataCount1 0x11 #define Pro_DataCount1 0x11
#define Pro_DataCount0 0x12 #define Pro_DataCount0 0x12

7
drivers/staging/rts5208/rtsx.c
View File

@ -111,7 +111,6 @@ static int slave_configure(struct scsi_device *sdev)
return 0; return 0;
} }
/*********************************************************************** /***********************************************************************
* /proc/scsi/ functions * /proc/scsi/ functions
***********************************************************************/ ***********************************************************************/
@ -209,7 +208,6 @@ static int bus_reset(struct scsi_cmnd *srb)
return result < 0 ? FAILED : SUCCESS; return result < 0 ? FAILED : SUCCESS;
} }
/* /*
* this defines our host template, with which we'll allocate hosts * this defines our host template, with which we'll allocate hosts
*/ */
@ -259,7 +257,6 @@ static struct scsi_host_template rtsx_host_template = {
.module = THIS_MODULE .module = THIS_MODULE
}; };
static int rtsx_acquire_irq(struct rtsx_dev *dev) static int rtsx_acquire_irq(struct rtsx_dev *dev)
{ {
struct rtsx_chip *chip = dev->chip; struct rtsx_chip *chip = dev->chip;
@ -282,7 +279,6 @@ static int rtsx_acquire_irq(struct rtsx_dev *dev)
return 0; return 0;
} }
int rtsx_read_pci_cfg_byte(u8 bus, u8 dev, u8 func, u8 offset, u8 *val) int rtsx_read_pci_cfg_byte(u8 bus, u8 dev, u8 func, u8 offset, u8 *val)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
@ -515,7 +511,6 @@ SkipForAbort:
complete_and_exit(&dev->control_exit, 0); complete_and_exit(&dev->control_exit, 0);
} }
static int rtsx_polling_thread(void *__dev) static int rtsx_polling_thread(void *__dev)
{ {
struct rtsx_dev *dev = __dev; struct rtsx_dev *dev = __dev;
@ -625,7 +620,6 @@ Exit:
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* Release all our dynamic resources */ /* Release all our dynamic resources */
static void rtsx_release_resources(struct rtsx_dev *dev) static void rtsx_release_resources(struct rtsx_dev *dev)
{ {
@ -994,7 +988,6 @@ errout:
return err; return err;
} }
static void rtsx_remove(struct pci_dev *pci) static void rtsx_remove(struct pci_dev *pci)
{ {
struct rtsx_dev *dev = pci_get_drvdata(pci); struct rtsx_dev *dev = pci_get_drvdata(pci);

2
drivers/staging/rts5208/rtsx.h
View File

@ -77,7 +77,6 @@ do { \
} while (0) } while (0)
#define wait_timeout(msecs) wait_timeout_x(TASK_INTERRUPTIBLE, (msecs)) #define wait_timeout(msecs) wait_timeout_x(TASK_INTERRUPTIBLE, (msecs))
#define STATE_TRANS_NONE 0 #define STATE_TRANS_NONE 0
#define STATE_TRANS_CMD 1 #define STATE_TRANS_CMD 1
#define STATE_TRANS_BUF 2 #define STATE_TRANS_BUF 2
@ -138,6 +137,7 @@ static inline struct Scsi_Host *rtsx_to_host(struct rtsx_dev *dev)
{ {
return container_of((void *) dev, struct Scsi_Host, hostdata); return container_of((void *) dev, struct Scsi_Host, hostdata);
} }
static inline struct rtsx_dev *host_to_rtsx(struct Scsi_Host *host) static inline struct rtsx_dev *host_to_rtsx(struct Scsi_Host *host)
{ {
return (struct rtsx_dev *) host->hostdata; return (struct rtsx_dev *) host->hostdata;

1
drivers/staging/rts5208/rtsx_card.c
View File

@ -1065,7 +1065,6 @@ int card_share_mode(struct rtsx_chip *chip, int card)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
int select_card(struct rtsx_chip *chip, int card) int select_card(struct rtsx_chip *chip, int card)
{ {
int retval; int retval;

6
drivers/staging/rts5208/rtsx_chip.h
View File

@ -101,7 +101,6 @@
#define TRANSPORT_NO_SENSE 2 /* Command failed, no auto-sense */ #define TRANSPORT_NO_SENSE 2 /* Command failed, no auto-sense */
#define TRANSPORT_ERROR 3 /* Transport bad (i.e. device dead) */ #define TRANSPORT_ERROR 3 /* Transport bad (i.e. device dead) */
/*----------------------------------- /*-----------------------------------
Start-Stop-Unit Start-Stop-Unit
-----------------------------------*/ -----------------------------------*/
@ -228,7 +227,6 @@
#define ASCQ_LOAD_EJCT_ERR 0x00 #define ASCQ_LOAD_EJCT_ERR 0x00
#define ASCQ_WRITE_PROTECT 0x00 #define ASCQ_WRITE_PROTECT 0x00
struct sense_data_t { struct sense_data_t {
unsigned char err_code; /* error code */ unsigned char err_code; /* error code */
/* bit7 : valid */ /* bit7 : valid */
@ -305,7 +303,6 @@ struct sense_data_t {
#define MS_OC_INT_EN (1 << 23) #define MS_OC_INT_EN (1 << 23)
#define SD_OC_INT_EN (1 << 22) #define SD_OC_INT_EN (1 << 22)
#define READ_REG_CMD 0 #define READ_REG_CMD 0
#define WRITE_REG_CMD 1 #define WRITE_REG_CMD 1
#define CHECK_REG_CMD 2 #define CHECK_REG_CMD 2
@ -313,7 +310,6 @@ struct sense_data_t {
#define HOST_TO_DEVICE 0 #define HOST_TO_DEVICE 0
#define DEVICE_TO_HOST 1 #define DEVICE_TO_HOST 1
#define RTSX_RESV_BUF_LEN 4096 #define RTSX_RESV_BUF_LEN 4096
#define HOST_CMDS_BUF_LEN 1024 #define HOST_CMDS_BUF_LEN 1024
#define HOST_SG_TBL_BUF_LEN (RTSX_RESV_BUF_LEN - HOST_CMDS_BUF_LEN) #define HOST_SG_TBL_BUF_LEN (RTSX_RESV_BUF_LEN - HOST_CMDS_BUF_LEN)
@ -332,7 +328,6 @@ struct sense_data_t {
#define XD_FREE_TABLE_CNT 1200 #define XD_FREE_TABLE_CNT 1200
#define MS_FREE_TABLE_CNT 512 #define MS_FREE_TABLE_CNT 512
/* Bit Operation */ /* Bit Operation */
#define SET_BIT(data, idx) ((data) |= 1 << (idx)) #define SET_BIT(data, idx) ((data) |= 1 << (idx))
#define CLR_BIT(data, idx) ((data) &= ~(1 << (idx))) #define CLR_BIT(data, idx) ((data) &= ~(1 << (idx)))
@ -618,7 +613,6 @@ struct spi_info {
int spi_clock; int spi_clock;
}; };
#ifdef _MSG_TRACE #ifdef _MSG_TRACE
struct trace_msg_t { struct trace_msg_t {
u16 line; u16 line;

4
drivers/staging/rts5208/rtsx_scsi.c
View File

@ -558,7 +558,6 @@ static int inquiry(struct scsi_cmnd *srb, struct rtsx_chip *chip)
return TRANSPORT_GOOD; return TRANSPORT_GOOD;
} }
static int start_stop_unit(struct scsi_cmnd *srb, struct rtsx_chip *chip) static int start_stop_unit(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
unsigned int lun = SCSI_LUN(srb); unsigned int lun = SCSI_LUN(srb);
@ -594,7 +593,6 @@ static int start_stop_unit(struct scsi_cmnd *srb, struct rtsx_chip *chip)
return TRANSPORT_ERROR; return TRANSPORT_ERROR;
} }
static int allow_medium_removal(struct scsi_cmnd *srb, struct rtsx_chip *chip) static int allow_medium_removal(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
int prevent; int prevent;
@ -613,7 +611,6 @@ static int allow_medium_removal(struct scsi_cmnd *srb, struct rtsx_chip *chip)
return TRANSPORT_GOOD; return TRANSPORT_GOOD;
} }
static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip) static int request_sense(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
struct sense_data_t *sense; struct sense_data_t *sense;
@ -2604,7 +2601,6 @@ static int app_cmd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
return result; return result;
} }
static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip) static int read_status(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{ {
u8 rtsx_status[16]; u8 rtsx_status[16];

1
drivers/staging/rts5208/rtsx_transport.h
View File

@ -38,7 +38,6 @@ void rtsx_stor_get_xfer_buf(unsigned char *buffer,
unsigned int buflen, struct scsi_cmnd *srb); unsigned int buflen, struct scsi_cmnd *srb);
void rtsx_invoke_transport(struct scsi_cmnd *srb, struct rtsx_chip *chip); void rtsx_invoke_transport(struct scsi_cmnd *srb, struct rtsx_chip *chip);
#define rtsx_init_cmd(chip) ((chip)->ci = 0) #define rtsx_init_cmd(chip) ((chip)->ci = 0)
void rtsx_add_cmd(struct rtsx_chip *chip, void rtsx_add_cmd(struct rtsx_chip *chip,

4
drivers/staging/rts5208/sd.c
View File

@ -1428,7 +1428,6 @@ static int sd_switch_function(struct rtsx_chip *chip, u8 bus_width)
continue; continue;
} }
if (func_to_switch) if (func_to_switch)
break; break;
@ -2975,7 +2974,6 @@ SD_UNLOCK_ENTRY:
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width) static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
{ {
struct sd_info *sd_card = &(chip->sd_card); struct sd_info *sd_card = &(chip->sd_card);
@ -3105,7 +3103,6 @@ static int mmc_test_switch_bus(struct rtsx_chip *chip, u8 width)
return SWITCH_FAIL; return SWITCH_FAIL;
} }
static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr) static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
{ {
struct sd_info *sd_card = &(chip->sd_card); struct sd_info *sd_card = &(chip->sd_card);
@ -3230,7 +3227,6 @@ static int mmc_switch_timing_bus(struct rtsx_chip *chip, bool switch_ddr)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int reset_mmc(struct rtsx_chip *chip) static int reset_mmc(struct rtsx_chip *chip)
{ {
struct sd_info *sd_card = &(chip->sd_card); struct sd_info *sd_card = &(chip->sd_card);

1
drivers/staging/rts5208/spi.h
View File

@ -61,5 +61,4 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip);
int spi_erase_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip); int spi_erase_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip);
int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip); int spi_write_flash_status(struct scsi_cmnd *srb, struct rtsx_chip *chip);
#endif /* __REALTEK_RTSX_SPI_H */ #endif /* __REALTEK_RTSX_SPI_H */

4
drivers/staging/rts5208/xd.c
View File

@ -834,7 +834,6 @@ static int xd_check_data_blank(u8 *redunt)
!= (XD_ECC1_ALL1 | XD_ECC2_ALL1)) != (XD_ECC1_ALL1 | XD_ECC2_ALL1))
return 0; return 0;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (redunt[RESERVED0 + i] != 0xFF) if (redunt[RESERVED0 + i] != 0xFF)
return 0; return 0;
@ -1402,7 +1401,6 @@ static int xd_erase_block(struct rtsx_chip *chip, u32 phy_blk)
return STATUS_FAIL; return STATUS_FAIL;
} }
static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no) static int xd_build_l2p_tbl(struct rtsx_chip *chip, int zone_no)
{ {
struct xd_info *xd_card = &(chip->xd_card); struct xd_info *xd_card = &(chip->xd_card);
@ -1830,7 +1828,6 @@ static int xd_prepare_write(struct rtsx_chip *chip,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk, static int xd_write_multiple_pages(struct rtsx_chip *chip, u32 old_blk,
u32 new_blk, u32 log_blk, u8 start_page, u32 new_blk, u32 log_blk, u8 start_page,
u8 end_page, u8 *buf, unsigned int *index, u8 end_page, u8 *buf, unsigned int *index,
@ -2000,7 +1997,6 @@ int xd_rw(struct scsi_cmnd *srb, struct rtsx_chip *chip,
return STATUS_FAIL; return STATUS_FAIL;
} }
if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) { if (detect_card_cd(chip, XD_CARD) != STATUS_SUCCESS) {
chip->card_fail |= XD_CARD; chip->card_fail |= XD_CARD;
set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT); set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT);