diff options
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/wbsd.c | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 80bc9a5c25cc..ea3888b65d5d 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
| @@ -127,7 +127,7 @@ struct atmel_mci_dma { | |||
| 127 | * EVENT_DATA_COMPLETE is set in @pending_events, all data-related | 127 | * EVENT_DATA_COMPLETE is set in @pending_events, all data-related |
| 128 | * interrupts must be disabled and @data_status updated with a | 128 | * interrupts must be disabled and @data_status updated with a |
| 129 | * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the | 129 | * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the |
| 130 | * CMDRDY interupt must be disabled and @cmd_status updated with a | 130 | * CMDRDY interrupt must be disabled and @cmd_status updated with a |
| 131 | * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the | 131 | * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the |
| 132 | * bytes_xfered field of @data must be written. This is ensured by | 132 | * bytes_xfered field of @data must be written. This is ensured by |
| 133 | * using barriers. | 133 | * using barriers. |
| @@ -1082,7 +1082,7 @@ static void atmci_request_end(struct atmel_mci *host, struct mmc_request *mrq) | |||
| 1082 | /* | 1082 | /* |
| 1083 | * Update the MMC clock rate if necessary. This may be | 1083 | * Update the MMC clock rate if necessary. This may be |
| 1084 | * necessary if set_ios() is called when a different slot is | 1084 | * necessary if set_ios() is called when a different slot is |
| 1085 | * busy transfering data. | 1085 | * busy transferring data. |
| 1086 | */ | 1086 | */ |
| 1087 | if (host->need_clock_update) { | 1087 | if (host->need_clock_update) { |
| 1088 | mci_writel(host, MR, host->mode_reg); | 1088 | mci_writel(host, MR, host->mode_reg); |
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 2f7fc0c5146f..7c1e16aaf17f 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c | |||
| @@ -99,7 +99,7 @@ | |||
| 99 | #define r1b_timeout (HZ * 3) | 99 | #define r1b_timeout (HZ * 3) |
| 100 | 100 | ||
| 101 | /* One of the critical speed parameters is the amount of data which may | 101 | /* One of the critical speed parameters is the amount of data which may |
| 102 | * be transfered in one command. If this value is too low, the SD card | 102 | * be transferred in one command. If this value is too low, the SD card |
| 103 | * controller has to do multiple partial block writes (argggh!). With | 103 | * controller has to do multiple partial block writes (argggh!). With |
| 104 | * today (2008) SD cards there is little speed gain if we transfer more | 104 | * today (2008) SD cards there is little speed gain if we transfer more |
| 105 | * than 64 KBytes at a time. So use this value until there is any indication | 105 | * than 64 KBytes at a time. So use this value until there is any indication |
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 1ccd4b256cee..a04f87d7ee3d 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
| @@ -874,7 +874,7 @@ static void finalize_request(struct s3cmci_host *host) | |||
| 874 | if (!mrq->data) | 874 | if (!mrq->data) |
| 875 | goto request_done; | 875 | goto request_done; |
| 876 | 876 | ||
| 877 | /* Calulate the amout of bytes transfer if there was no error */ | 877 | /* Calculate the amout of bytes transfer if there was no error */ |
| 878 | if (mrq->data->error == 0) { | 878 | if (mrq->data->error == 0) { |
| 879 | mrq->data->bytes_xfered = | 879 | mrq->data->bytes_xfered = |
| 880 | (mrq->data->blocks * mrq->data->blksz); | 880 | (mrq->data->blocks * mrq->data->blksz); |
| @@ -882,7 +882,7 @@ static void finalize_request(struct s3cmci_host *host) | |||
| 882 | mrq->data->bytes_xfered = 0; | 882 | mrq->data->bytes_xfered = 0; |
| 883 | } | 883 | } |
| 884 | 884 | ||
| 885 | /* If we had an error while transfering data we flush the | 885 | /* If we had an error while transferring data we flush the |
| 886 | * DMA channel and the fifo to clear out any garbage. */ | 886 | * DMA channel and the fifo to clear out any garbage. */ |
| 887 | if (mrq->data->error != 0) { | 887 | if (mrq->data->error != 0) { |
| 888 | if (s3cmci_host_usedma(host)) | 888 | if (s3cmci_host_usedma(host)) |
| @@ -980,7 +980,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data) | |||
| 980 | 980 | ||
| 981 | if ((data->blksz & 3) != 0) { | 981 | if ((data->blksz & 3) != 0) { |
| 982 | /* We cannot deal with unaligned blocks with more than | 982 | /* We cannot deal with unaligned blocks with more than |
| 983 | * one block being transfered. */ | 983 | * one block being transferred. */ |
| 984 | 984 | ||
| 985 | if (data->blocks > 1) { | 985 | if (data->blocks > 1) { |
| 986 | pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz); | 986 | pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz); |
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 6ae8d2f00ec7..62d37de6de76 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c | |||
| @@ -355,7 +355,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command | |||
| 355 | /* | 355 | /* |
| 356 | * This chip always returns (at least?) as much data as you ask for. | 356 | * This chip always returns (at least?) as much data as you ask for. |
| 357 | * I'm unsure what happens if you ask for less than a block. This should be | 357 | * I'm unsure what happens if you ask for less than a block. This should be |
| 358 | * looked into to ensure that a funny length read doesnt hose the controller. | 358 | * looked into to ensure that a funny length read doesn't hose the controller. |
| 359 | */ | 359 | */ |
| 360 | static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) | 360 | static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) |
| 361 | { | 361 | { |
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index 7fca0a386ba0..62e5a4d171e1 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c | |||
| @@ -484,7 +484,7 @@ static void wbsd_fill_fifo(struct wbsd_host *host) | |||
| 484 | 484 | ||
| 485 | /* | 485 | /* |
| 486 | * Check that we aren't being called after the | 486 | * Check that we aren't being called after the |
| 487 | * entire buffer has been transfered. | 487 | * entire buffer has been transferred. |
| 488 | */ | 488 | */ |
| 489 | if (host->num_sg == 0) | 489 | if (host->num_sg == 0) |
| 490 | return; | 490 | return; |
| @@ -828,7 +828,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq) | |||
| 828 | /* | 828 | /* |
| 829 | * If this is a data transfer the request | 829 | * If this is a data transfer the request |
| 830 | * will be finished after the data has | 830 | * will be finished after the data has |
| 831 | * transfered. | 831 | * transferred. |
| 832 | */ | 832 | */ |
| 833 | if (cmd->data && !cmd->error) { | 833 | if (cmd->data && !cmd->error) { |
| 834 | /* | 834 | /* |
| @@ -904,7 +904,7 @@ static void wbsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 904 | setup &= ~WBSD_DAT3_H; | 904 | setup &= ~WBSD_DAT3_H; |
| 905 | 905 | ||
| 906 | /* | 906 | /* |
| 907 | * We cannot resume card detection immediatly | 907 | * We cannot resume card detection immediately |
| 908 | * because of capacitance and delays in the chip. | 908 | * because of capacitance and delays in the chip. |
| 909 | */ | 909 | */ |
| 910 | mod_timer(&host->ignore_timer, jiffies + HZ / 100); | 910 | mod_timer(&host->ignore_timer, jiffies + HZ / 100); |
