Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235960
b: refs/heads/master
c: 6680d2c
h: refs/heads/master
v: v3
  • Loading branch information
wwang authored and Greg Kroah-Hartman committed Feb 18, 2011
1 parent 63ab944 commit 8ee0a0f
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7eb90a3682fc42c5607cff931e5d0f6a9d52dc03
refs/heads/master: 6680d2cab316a0c0e4cea0727e6d63426a77bb12
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rts_pstor/ms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3594,7 +3594,7 @@ void ms_free_l2p_tbl(struct rtsx_chip *chip)
#ifdef SUPPORT_MAGIC_GATE

#ifdef READ_BYTES_WAIT_INT
int ms_poll_int(struct rtsx_chip *chip)
static int ms_poll_int(struct rtsx_chip *chip)
{
int retval;
u8 val;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/rts_pstor/rtsx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static int bus_reset(struct scsi_cmnd *srb)
* this defines our host template, with which we'll allocate hosts
*/

struct scsi_host_template rtsx_host_template = {
static struct scsi_host_template rtsx_host_template = {
/* basic userland interface stuff */
.name = CR_DRIVER_NAME,
.proc_name = CR_DRIVER_NAME,
Expand Down Expand Up @@ -436,7 +436,7 @@ static int rtsx_resume(struct pci_dev *pci)
}
#endif /* CONFIG_PM */

void rtsx_shutdown(struct pci_dev *pci)
static void rtsx_shutdown(struct pci_dev *pci)
{
struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
struct rtsx_chip *chip;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rts_pstor/rtsx_card.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void do_reset_ms_card(struct rtsx_chip *chip)
}
}

void release_sdio(struct rtsx_chip *chip)
static void release_sdio(struct rtsx_chip *chip)
{
if (chip->sd_io) {
rtsx_write_register(chip, CARD_STOP, SD_STOP | SD_CLR_ERR,
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/rts_pstor/rtsx_chip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ static inline int check_sd_current_prior(u32 sd_current_prior)
return !fake_para;
}

int rts5209_init(struct rtsx_chip *chip)
static int rts5209_init(struct rtsx_chip *chip)
{
int retval;
u32 lval = 0;
Expand Down Expand Up @@ -805,7 +805,7 @@ int rts5209_init(struct rtsx_chip *chip)
return STATUS_SUCCESS;
}

int rts5208_init(struct rtsx_chip *chip)
static int rts5208_init(struct rtsx_chip *chip)
{
int retval;
u16 reg = 0;
Expand Down Expand Up @@ -871,7 +871,7 @@ int rts5208_init(struct rtsx_chip *chip)
return STATUS_SUCCESS;
}

int rts5288_init(struct rtsx_chip *chip)
static int rts5288_init(struct rtsx_chip *chip)
{
int retval;
u8 val = 0, max_func;
Expand Down Expand Up @@ -1097,7 +1097,7 @@ static inline void rtsx_blink_led(struct rtsx_chip *chip)
}
#endif

void rtsx_monitor_aspm_config(struct rtsx_chip *chip)
static void rtsx_monitor_aspm_config(struct rtsx_chip *chip)
{
int maybe_support_aspm, reg_changed;
u32 tmp = 0;
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/rts_pstor/rtsx_scsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ static int test_unit_ready(struct scsi_cmnd *srb, struct rtsx_chip *chip)
return TRANSPORT_GOOD;
}

unsigned char formatter_inquiry_str[20] = {
static unsigned char formatter_inquiry_str[20] = {
'M', 'E', 'M', 'O', 'R', 'Y', 'S', 'T', 'I', 'C', 'K',
#ifdef SUPPORT_MAGIC_GATE
'-', 'M', 'G', /* Byte[47:49] */
Expand Down Expand Up @@ -2690,7 +2690,7 @@ static int ms_format_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
}

#ifdef SUPPORT_PCGL_1P18
int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)
static int get_ms_information(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{
struct ms_info *ms_card = &(chip->ms_card);
unsigned int lun = SCSI_LUN(srb);
Expand Down Expand Up @@ -2864,7 +2864,7 @@ static int sd_extention_cmnd(struct scsi_cmnd *srb, struct rtsx_chip *chip)
#endif

#ifdef SUPPORT_MAGIC_GATE
int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
static int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{
struct ms_info *ms_card = &(chip->ms_card);
unsigned int lun = SCSI_LUN(srb);
Expand Down Expand Up @@ -2962,7 +2962,7 @@ int mg_report_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
return TRANSPORT_GOOD;
}

int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
static int mg_send_key(struct scsi_cmnd *srb, struct rtsx_chip *chip)
{
struct ms_info *ms_card = &(chip->ms_card);
unsigned int lun = SCSI_LUN(srb);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rts_pstor/rtsx_transport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static inline void rtsx_add_sg_tbl(
} while (len);
}

int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card,
static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card,
struct scatterlist *sg, int num_sg, unsigned int *index,
unsigned int *offset, int size,
enum dma_data_direction dma_dir, int timeout)
Expand Down Expand Up @@ -485,7 +485,7 @@ int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card,
return err;
}

int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card,
static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card,
struct scatterlist *sg, int num_sg,
enum dma_data_direction dma_dir, int timeout)
{
Expand Down Expand Up @@ -632,7 +632,7 @@ int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card,
return err;
}

int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf, size_t len,
enum dma_data_direction dma_dir, int timeout)
{
struct rtsx_dev *rtsx = chip->rtsx;
Expand Down
48 changes: 24 additions & 24 deletions trunk/drivers/staging/rts_pstor/sd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,30 @@

#define SD_MAX_RETRY_COUNT 3

u16 REG_SD_CFG1;
u16 REG_SD_CFG2;
u16 REG_SD_CFG3;
u16 REG_SD_STAT1;
u16 REG_SD_STAT2;
u16 REG_SD_BUS_STAT;
u16 REG_SD_PAD_CTL;
u16 REG_SD_SAMPLE_POINT_CTL;
u16 REG_SD_PUSH_POINT_CTL;
u16 REG_SD_CMD0;
u16 REG_SD_CMD1;
u16 REG_SD_CMD2;
u16 REG_SD_CMD3;
u16 REG_SD_CMD4;
u16 REG_SD_CMD5;
u16 REG_SD_BYTE_CNT_L;
u16 REG_SD_BYTE_CNT_H;
u16 REG_SD_BLOCK_CNT_L;
u16 REG_SD_BLOCK_CNT_H;
u16 REG_SD_TRANSFER;
u16 REG_SD_VPCLK0_CTL;
u16 REG_SD_VPCLK1_CTL;
u16 REG_SD_DCMPS0_CTL;
u16 REG_SD_DCMPS1_CTL;
static u16 REG_SD_CFG1;
static u16 REG_SD_CFG2;
static u16 REG_SD_CFG3;
static u16 REG_SD_STAT1;
static u16 REG_SD_STAT2;
static u16 REG_SD_BUS_STAT;
static u16 REG_SD_PAD_CTL;
static u16 REG_SD_SAMPLE_POINT_CTL;
static u16 REG_SD_PUSH_POINT_CTL;
static u16 REG_SD_CMD0;
static u16 REG_SD_CMD1;
static u16 REG_SD_CMD2;
static u16 REG_SD_CMD3;
static u16 REG_SD_CMD4;
static u16 REG_SD_CMD5;
static u16 REG_SD_BYTE_CNT_L;
static u16 REG_SD_BYTE_CNT_H;
static u16 REG_SD_BLOCK_CNT_L;
static u16 REG_SD_BLOCK_CNT_H;
static u16 REG_SD_TRANSFER;
static u16 REG_SD_VPCLK0_CTL;
static u16 REG_SD_VPCLK1_CTL;
static u16 REG_SD_DCMPS0_CTL;
static u16 REG_SD_DCMPS1_CTL;

static inline void sd_set_err_code(struct rtsx_chip *chip, u8 err_code)
{
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rts_pstor/spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static int spi_init_eeprom(struct rtsx_chip *chip)
return STATUS_SUCCESS;
}

int spi_eeprom_program_enable(struct rtsx_chip *chip)
static int spi_eeprom_program_enable(struct rtsx_chip *chip)
{
int retval;

Expand Down

0 comments on commit 8ee0a0f

Please sign in to comment.