aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 12:06:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 12:06:36 -0400
commit99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch)
tree2b2fc83db20b4c6d13842496899774b0dc2868e2 /drivers/spi
parentaae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff)
parent9c33c512b2d3167a3580659942ee78437b1b1bc6 (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/spi')
-rw-r--r--drivers/spi/spi-au1550.c2
-rw-r--r--drivers/spi/spi-bfin-sport.c2
-rw-r--r--drivers/spi/spi-oc-tiny.c2
-rw-r--r--drivers/spi/spi-ppc4xx.c4
-rw-r--r--drivers/spi/spi-topcliff-pch.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index 5784c879961..4de66d1cfe5 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -475,7 +475,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
475 /* 475 /*
476 * due to an spi error we consider transfer as done, 476 * due to an spi error we consider transfer as done,
477 * so mask all events until before next transfer start 477 * so mask all events until before next transfer start
478 * and stop the possibly running dma immediatelly 478 * and stop the possibly running dma immediately
479 */ 479 */
480 au1550_spi_mask_ack_all(hw); 480 au1550_spi_mask_ack_all(hw);
481 au1xxx_dbdma_stop(hw->dma_rx_ch); 481 au1xxx_dbdma_stop(hw->dma_rx_ch);
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 1fe51198a62..6555ecd0730 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -467,7 +467,7 @@ bfin_sport_spi_pump_transfers(unsigned long data)
467 dev_dbg(drv_data->dev, "IO write error!\n"); 467 dev_dbg(drv_data->dev, "IO write error!\n");
468 drv_data->state = ERROR_STATE; 468 drv_data->state = ERROR_STATE;
469 } else { 469 } else {
470 /* Update total byte transfered */ 470 /* Update total byte transferred */
471 message->actual_length += transfer->len; 471 message->actual_length += transfer->len;
472 /* Move to next transfer of this msg */ 472 /* Move to next transfer of this msg */
473 drv_data->state = bfin_sport_spi_next_transfer(drv_data); 473 drv_data->state = bfin_sport_spi_next_transfer(drv_data);
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 698018fd992..9d9071b730b 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -129,7 +129,7 @@ static int tiny_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
129 unsigned int i; 129 unsigned int i;
130 130
131 if (hw->irq >= 0) { 131 if (hw->irq >= 0) {
132 /* use intrrupt driven data transfer */ 132 /* use interrupt driven data transfer */
133 hw->len = t->len; 133 hw->len = t->len;
134 hw->txp = t->tx_buf; 134 hw->txp = t->tx_buf;
135 hw->rxp = t->rx_buf; 135 hw->rxp = t->rx_buf;
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 75ac9d48ef4..7a85f22b647 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -101,7 +101,7 @@ struct spi_ppc4xx_regs {
101 u8 dummy; 101 u8 dummy;
102 /* 102 /*
103 * Clock divisor modulus register 103 * Clock divisor modulus register
104 * This uses the follwing formula: 104 * This uses the following formula:
105 * SCPClkOut = OPBCLK/(4(CDM + 1)) 105 * SCPClkOut = OPBCLK/(4(CDM + 1))
106 * or 106 * or
107 * CDM = (OPBCLK/4*SCPClkOut) - 1 107 * CDM = (OPBCLK/4*SCPClkOut) - 1
@@ -201,7 +201,7 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)
201 return -EINVAL; 201 return -EINVAL;
202 } 202 }
203 203
204 /* Write new configration */ 204 /* Write new configuration */
205 out_8(&hw->regs->mode, cs->mode); 205 out_8(&hw->regs->mode, cs->mode);
206 206
207 /* Set the clock */ 207 /* Set the clock */
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index cd56dcf4632..1284c9b7465 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -505,7 +505,7 @@ static int pch_spi_transfer(struct spi_device *pspi, struct spi_message *pmsg)
505 } 505 }
506 506
507 if (unlikely(pspi->max_speed_hz == 0)) { 507 if (unlikely(pspi->max_speed_hz == 0)) {
508 dev_err(&pspi->dev, "%s pch_spi_tranfer maxspeed=%d\n", 508 dev_err(&pspi->dev, "%s pch_spi_transfer maxspeed=%d\n",
509 __func__, pspi->max_speed_hz); 509 __func__, pspi->max_speed_hz);
510 retval = -EINVAL; 510 retval = -EINVAL;
511 goto err_out; 511 goto err_out;