diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
commit | 99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch) | |
tree | 2b2fc83db20b4c6d13842496899774b0dc2868e2 /drivers/mmc/host | |
parent | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff) | |
parent | 9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina:
"Tiny usual fixes all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
doc: fix old config name of kprobetrace
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
btrfs: fix the commment for the action flags in delayed-ref.h
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
vfs: fix kerneldoc for generic_fh_to_parent()
treewide: fix comment/printk/variable typos
ipr: fix small coding style issues
doc: fix broken utf8 encoding
nfs: comment fix
platform/x86: fix asus_laptop.wled_type module parameter
mfd: printk/comment fixes
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
doc: aliasing-test: close fd on write error
mmc: fix comment typos
dma: fix comments
spi: fix comment/printk typos in spi
Coccinelle: fix typo in memdup_user.cocci
tmiofb: missing NULL pointer checks
tools: perf: Fix typo in tools/perf
tools/testing: fix comment / output typos
...
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r-- | drivers/mmc/host/at91_mci.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/atmel-mci.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 2 | ||||
-rw-r--r-- | drivers/mmc/host/vub300.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index efdb81d21c44..74bed0fc23e7 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
@@ -356,7 +356,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host) | |||
356 | } | 356 | } |
357 | 357 | ||
358 | /* | 358 | /* |
359 | * Update bytes tranfered count during a write operation | 359 | * Update bytes transfered count during a write operation |
360 | */ | 360 | */ |
361 | static void at91_mci_update_bytes_xfered(struct at91mci_host *host) | 361 | static void at91_mci_update_bytes_xfered(struct at91mci_host *host) |
362 | { | 362 | { |
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index a53c7c478e05..852d5fbda630 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
@@ -1022,7 +1022,7 @@ static void atmci_stop_transfer(struct atmel_mci *host) | |||
1022 | } | 1022 | } |
1023 | 1023 | ||
1024 | /* | 1024 | /* |
1025 | * Stop data transfer because error(s) occured. | 1025 | * Stop data transfer because error(s) occurred. |
1026 | */ | 1026 | */ |
1027 | static void atmci_stop_transfer_pdc(struct atmel_mci *host) | 1027 | static void atmci_stop_transfer_pdc(struct atmel_mci *host) |
1028 | { | 1028 | { |
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 3a09f93cc3b6..686e256764c8 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -447,7 +447,7 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host) | |||
447 | OMAP_HSMMC_WRITE(host->base, SYSCTL, | 447 | OMAP_HSMMC_WRITE(host->base, SYSCTL, |
448 | OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN); | 448 | OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN); |
449 | if ((OMAP_HSMMC_READ(host->base, SYSCTL) & CEN) != 0x0) | 449 | if ((OMAP_HSMMC_READ(host->base, SYSCTL) & CEN) != 0x0) |
450 | dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n"); | 450 | dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stopped\n"); |
451 | } | 451 | } |
452 | 452 | ||
453 | static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host, | 453 | static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host, |
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index e23f8134591c..32f4a070551f 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
@@ -315,7 +315,7 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg) | |||
315 | new_val = val & (SDHCI_CTRL_LED | \ | 315 | new_val = val & (SDHCI_CTRL_LED | \ |
316 | SDHCI_CTRL_4BITBUS | \ | 316 | SDHCI_CTRL_4BITBUS | \ |
317 | SDHCI_CTRL_D3CD); | 317 | SDHCI_CTRL_D3CD); |
318 | /* ensure the endianess */ | 318 | /* ensure the endianness */ |
319 | new_val |= ESDHC_HOST_CONTROL_LE; | 319 | new_val |= ESDHC_HOST_CONTROL_LE; |
320 | /* bits 8&9 are reserved on mx25 */ | 320 | /* bits 8&9 are reserved on mx25 */ |
321 | if (!is_imx25_esdhc(imx_data)) { | 321 | if (!is_imx25_esdhc(imx_data)) { |
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index 3135a1a5d75d..58eab9ac1d01 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c | |||
@@ -806,7 +806,7 @@ static void command_res_completed(struct urb *urb) | |||
806 | * we suspect a buggy USB host controller | 806 | * we suspect a buggy USB host controller |
807 | */ | 807 | */ |
808 | } else if (!vub300->data) { | 808 | } else if (!vub300->data) { |
809 | /* this means that the command (typically CMD52) suceeded */ | 809 | /* this means that the command (typically CMD52) succeeded */ |
810 | } else if (vub300->resp.common.header_type != 0x02) { | 810 | } else if (vub300->resp.common.header_type != 0x02) { |
811 | /* | 811 | /* |
812 | * this is an error response from the VUB300 chip | 812 | * this is an error response from the VUB300 chip |