summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 09:51:41 +0100
committerMark Brown <broonie@linaro.org>2013-10-25 09:51:41 +0100
commit344a85117d9c9e652c0a40c6d74e39e02ceeca5d (patch)
tree5866a32df26a6fe5f47d61a7f548b2efabd9bb6c /drivers/spi
parent605d427ccc27faaeca2970fe80865ead00aa67d0 (diff)
parent256fbf36d159f286011667ad84c378452d5fc1bf (diff)
downloadlinux-stable-344a85117d9c9e652c0a40c6d74e39e02ceeca5d.tar.gz
linux-stable-344a85117d9c9e652c0a40c6d74e39e02ceeca5d.tar.bz2
linux-stable-344a85117d9c9e652c0a40c6d74e39e02ceeca5d.zip
Merge remote-tracking branch 'spi/topic/txx9' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-txx9.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 1937be437246..637cce2b8bdd 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -177,7 +177,7 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
| 0x08,
TXx9_SPCR0);
- list_for_each_entry (t, &m->transfers, transfer_list) {
+ list_for_each_entry(t, &m->transfers, transfer_list) {
const void *txbuf = t->tx_buf;
void *rxbuf = t->rx_buf;
u32 data;
@@ -308,7 +308,7 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m)
m->actual_length = 0;
/* check each transfer's parameters */
- list_for_each_entry (t, &m->transfers, transfer_list) {
+ list_for_each_entry(t, &m->transfers, transfer_list) {
u32 speed_hz = t->speed_hz ? : spi->max_speed_hz;
u8 bits_per_word = t->bits_per_word;