mirror of https://gitee.com/openkylin/linux.git
mmc: at91_mci typo
Typo fix in at91_mci driver : standardized the typo (at91_mci everywhere) Signed-off-by: Nicolas Ferre <nicolas.ferre@rfo.atmel.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
parent
9d26a5d3f2
commit
e8d04d3dba
|
@ -131,7 +131,7 @@ struct at91mci_host
|
|||
/*
|
||||
* Copy from sg to a dma block - used for transfers
|
||||
*/
|
||||
static inline void at91mci_sg_to_dma(struct at91mci_host *host, struct mmc_data *data)
|
||||
static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data *data)
|
||||
{
|
||||
unsigned int len, i, size;
|
||||
unsigned *dmabuf = host->buffer;
|
||||
|
@ -180,7 +180,7 @@ static inline void at91mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
|
|||
/*
|
||||
* Prepare a dma read
|
||||
*/
|
||||
static void at91mci_pre_dma_read(struct at91mci_host *host)
|
||||
static void at91_mci_pre_dma_read(struct at91mci_host *host)
|
||||
{
|
||||
int i;
|
||||
struct scatterlist *sg;
|
||||
|
@ -248,7 +248,7 @@ static void at91mci_pre_dma_read(struct at91mci_host *host)
|
|||
/*
|
||||
* Handle after a dma read
|
||||
*/
|
||||
static void at91mci_post_dma_read(struct at91mci_host *host)
|
||||
static void at91_mci_post_dma_read(struct at91mci_host *host)
|
||||
{
|
||||
struct mmc_command *cmd;
|
||||
struct mmc_data *data;
|
||||
|
@ -299,7 +299,7 @@ static void at91mci_post_dma_read(struct at91mci_host *host)
|
|||
|
||||
/* Is there another transfer to trigger? */
|
||||
if (host->transfer_index < data->sg_len)
|
||||
at91mci_pre_dma_read(host);
|
||||
at91_mci_pre_dma_read(host);
|
||||
else {
|
||||
at91_mci_write(host, AT91_MCI_IER, AT91_MCI_RXBUFF);
|
||||
at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
|
||||
|
@ -464,7 +464,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
|
|||
host->buffer = NULL;
|
||||
host->total_length = 0;
|
||||
|
||||
at91mci_pre_dma_read(host);
|
||||
at91_mci_pre_dma_read(host);
|
||||
ier = AT91_MCI_ENDRX /* | AT91_MCI_RXBUFF */;
|
||||
}
|
||||
else {
|
||||
|
@ -476,7 +476,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
|
|||
host->total_length,
|
||||
&host->physical_address, GFP_KERNEL);
|
||||
|
||||
at91mci_sg_to_dma(host, data);
|
||||
at91_mci_sg_to_dma(host, data);
|
||||
|
||||
pr_debug("Transmitting %d bytes\n", host->total_length);
|
||||
|
||||
|
@ -506,7 +506,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
|
|||
/*
|
||||
* Wait for a command to complete
|
||||
*/
|
||||
static void at91mci_process_command(struct at91mci_host *host, struct mmc_command *cmd)
|
||||
static void at91_mci_process_command(struct at91mci_host *host, struct mmc_command *cmd)
|
||||
{
|
||||
unsigned int ier;
|
||||
|
||||
|
@ -521,15 +521,15 @@ static void at91mci_process_command(struct at91mci_host *host, struct mmc_comman
|
|||
/*
|
||||
* Process the next step in the request
|
||||
*/
|
||||
static void at91mci_process_next(struct at91mci_host *host)
|
||||
static void at91_mci_process_next(struct at91mci_host *host)
|
||||
{
|
||||
if (!(host->flags & FL_SENT_COMMAND)) {
|
||||
host->flags |= FL_SENT_COMMAND;
|
||||
at91mci_process_command(host, host->request->cmd);
|
||||
at91_mci_process_command(host, host->request->cmd);
|
||||
}
|
||||
else if ((!(host->flags & FL_SENT_STOP)) && host->request->stop) {
|
||||
host->flags |= FL_SENT_STOP;
|
||||
at91mci_process_command(host, host->request->stop);
|
||||
at91_mci_process_command(host, host->request->stop);
|
||||
}
|
||||
else
|
||||
mmc_request_done(host->mmc, host->request);
|
||||
|
@ -538,7 +538,7 @@ static void at91mci_process_next(struct at91mci_host *host)
|
|||
/*
|
||||
* Handle a command that has been completed
|
||||
*/
|
||||
static void at91mci_completed_command(struct at91mci_host *host)
|
||||
static void at91_mci_completed_command(struct at91mci_host *host)
|
||||
{
|
||||
struct mmc_command *cmd = host->cmd;
|
||||
unsigned int status;
|
||||
|
@ -583,7 +583,7 @@ static void at91mci_completed_command(struct at91mci_host *host)
|
|||
else
|
||||
cmd->error = MMC_ERR_NONE;
|
||||
|
||||
at91mci_process_next(host);
|
||||
at91_mci_process_next(host);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -595,7 +595,7 @@ static void at91_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|||
host->request = mrq;
|
||||
host->flags = 0;
|
||||
|
||||
at91mci_process_next(host);
|
||||
at91_mci_process_next(host);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -708,7 +708,7 @@ static irqreturn_t at91_mci_irq(int irq, void *devid)
|
|||
|
||||
if (int_status & AT91_MCI_ENDRX) {
|
||||
pr_debug("Receive has ended\n");
|
||||
at91mci_post_dma_read(host);
|
||||
at91_mci_post_dma_read(host);
|
||||
}
|
||||
|
||||
if (int_status & AT91_MCI_NOTBUSY) {
|
||||
|
@ -737,7 +737,7 @@ static irqreturn_t at91_mci_irq(int irq, void *devid)
|
|||
if (completed) {
|
||||
pr_debug("Completed command\n");
|
||||
at91_mci_write(host, AT91_MCI_IDR, 0xffffffff);
|
||||
at91mci_completed_command(host);
|
||||
at91_mci_completed_command(host);
|
||||
} else
|
||||
at91_mci_write(host, AT91_MCI_IDR, int_status);
|
||||
|
||||
|
|
Loading…
Reference in New Issue