diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-02-25 20:27:10 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-04 23:35:07 -0500 |
commit | 31804f638ef213f78f4a5ee896c4226ba55ab415 (patch) | |
tree | 735e32966a1a03b43c02f08fc8d9f5960d347209 /drivers | |
parent | 79c2f49a2dfed00e51b41427ef89c5e67263a8c3 (diff) |
spi: omap-100k: fix spacing coding style issue
Fix the following checkpatch issues.
ERROR: space prohibited after that open parenthesis '('
ERROR: space required before the open parenthesis '('
ERROR: trailing statements should be on next line
ERROR: space required after that ',' (ctx:VxV)
ERROR: spaces required around that '-=' (ctx:VxV)
WARNING: sizeof *cs should be sizeof(*cs)
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/spi/spi-omap-100k.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 3b8b36a144b4..c9e228242643 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c | |||
@@ -128,7 +128,7 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | spi100k_enable_clock(master); | 130 | spi100k_enable_clock(master); |
131 | writew( data , spi100k->base + SPI_TX_MSB); | 131 | writew(data , spi100k->base + SPI_TX_MSB); |
132 | 132 | ||
133 | writew(SPI_CTRL_SEN(0) | | 133 | writew(SPI_CTRL_SEN(0) | |
134 | SPI_CTRL_WORD_SIZE(len) | | 134 | SPI_CTRL_WORD_SIZE(len) | |
@@ -136,7 +136,8 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) | |||
136 | spi100k->base + SPI_CTRL); | 136 | spi100k->base + SPI_CTRL); |
137 | 137 | ||
138 | /* Wait for bit ack send change */ | 138 | /* Wait for bit ack send change */ |
139 | while((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_WE) != SPI_STATUS_WE); | 139 | while ((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_WE) != SPI_STATUS_WE) |
140 | ; | ||
140 | udelay(1000); | 141 | udelay(1000); |
141 | 142 | ||
142 | spi100k_disable_clock(master); | 143 | spi100k_disable_clock(master); |
@@ -144,7 +145,7 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) | |||
144 | 145 | ||
145 | static int spi100k_read_data(struct spi_master *master, int len) | 146 | static int spi100k_read_data(struct spi_master *master, int len) |
146 | { | 147 | { |
147 | int dataH,dataL; | 148 | int dataH, dataL; |
148 | struct omap1_spi100k *spi100k = spi_master_get_devdata(master); | 149 | struct omap1_spi100k *spi100k = spi_master_get_devdata(master); |
149 | 150 | ||
150 | /* Always do at least 16 bits */ | 151 | /* Always do at least 16 bits */ |
@@ -157,7 +158,8 @@ static int spi100k_read_data(struct spi_master *master, int len) | |||
157 | SPI_CTRL_RD, | 158 | SPI_CTRL_RD, |
158 | spi100k->base + SPI_CTRL); | 159 | spi100k->base + SPI_CTRL); |
159 | 160 | ||
160 | while((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_RD) != SPI_STATUS_RD); | 161 | while ((readw(spi100k->base + SPI_STATUS) & SPI_STATUS_RD) != SPI_STATUS_RD) |
162 | ; | ||
161 | udelay(1000); | 163 | udelay(1000); |
162 | 164 | ||
163 | dataL = readw(spi100k->base + SPI_RX_LSB); | 165 | dataL = readw(spi100k->base + SPI_RX_LSB); |
@@ -208,12 +210,12 @@ omap1_spi100k_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) | |||
208 | rx = xfer->rx_buf; | 210 | rx = xfer->rx_buf; |
209 | tx = xfer->tx_buf; | 211 | tx = xfer->tx_buf; |
210 | do { | 212 | do { |
211 | c-=1; | 213 | c -= 1; |
212 | if (xfer->tx_buf != NULL) | 214 | if (xfer->tx_buf != NULL) |
213 | spi100k_write_data(spi->master, word_len, *tx++); | 215 | spi100k_write_data(spi->master, word_len, *tx++); |
214 | if (xfer->rx_buf != NULL) | 216 | if (xfer->rx_buf != NULL) |
215 | *rx++ = spi100k_read_data(spi->master, word_len); | 217 | *rx++ = spi100k_read_data(spi->master, word_len); |
216 | } while(c); | 218 | } while (c); |
217 | } else if (word_len <= 16) { | 219 | } else if (word_len <= 16) { |
218 | u16 *rx; | 220 | u16 *rx; |
219 | const u16 *tx; | 221 | const u16 *tx; |
@@ -221,12 +223,12 @@ omap1_spi100k_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) | |||
221 | rx = xfer->rx_buf; | 223 | rx = xfer->rx_buf; |
222 | tx = xfer->tx_buf; | 224 | tx = xfer->tx_buf; |
223 | do { | 225 | do { |
224 | c-=2; | 226 | c -= 2; |
225 | if (xfer->tx_buf != NULL) | 227 | if (xfer->tx_buf != NULL) |
226 | spi100k_write_data(spi->master,word_len, *tx++); | 228 | spi100k_write_data(spi->master, word_len, *tx++); |
227 | if (xfer->rx_buf != NULL) | 229 | if (xfer->rx_buf != NULL) |
228 | *rx++ = spi100k_read_data(spi->master,word_len); | 230 | *rx++ = spi100k_read_data(spi->master, word_len); |
229 | } while(c); | 231 | } while (c); |
230 | } else if (word_len <= 32) { | 232 | } else if (word_len <= 32) { |
231 | u32 *rx; | 233 | u32 *rx; |
232 | const u32 *tx; | 234 | const u32 *tx; |
@@ -234,12 +236,12 @@ omap1_spi100k_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer) | |||
234 | rx = xfer->rx_buf; | 236 | rx = xfer->rx_buf; |
235 | tx = xfer->tx_buf; | 237 | tx = xfer->tx_buf; |
236 | do { | 238 | do { |
237 | c-=4; | 239 | c -= 4; |
238 | if (xfer->tx_buf != NULL) | 240 | if (xfer->tx_buf != NULL) |
239 | spi100k_write_data(spi->master,word_len, *tx); | 241 | spi100k_write_data(spi->master, word_len, *tx); |
240 | if (xfer->rx_buf != NULL) | 242 | if (xfer->rx_buf != NULL) |
241 | *rx = spi100k_read_data(spi->master,word_len); | 243 | *rx = spi100k_read_data(spi->master, word_len); |
242 | } while(c); | 244 | } while (c); |
243 | } | 245 | } |
244 | return count - c; | 246 | return count - c; |
245 | } | 247 | } |
@@ -281,7 +283,7 @@ static int omap1_spi100k_setup(struct spi_device *spi) | |||
281 | spi100k = spi_master_get_devdata(spi->master); | 283 | spi100k = spi_master_get_devdata(spi->master); |
282 | 284 | ||
283 | if (!cs) { | 285 | if (!cs) { |
284 | cs = kzalloc(sizeof *cs, GFP_KERNEL); | 286 | cs = kzalloc(sizeof(*cs), GFP_KERNEL); |
285 | if (!cs) | 287 | if (!cs) |
286 | return -ENOMEM; | 288 | return -ENOMEM; |
287 | cs->base = spi100k->base + spi->chip_select * 0x14; | 289 | cs->base = spi100k->base + spi->chip_select * 0x14; |
@@ -398,14 +400,14 @@ static int omap1_spi100k_probe(struct platform_device *pdev) | |||
398 | if (!pdev->id) | 400 | if (!pdev->id) |
399 | return -EINVAL; | 401 | return -EINVAL; |
400 | 402 | ||
401 | master = spi_alloc_master(&pdev->dev, sizeof *spi100k); | 403 | master = spi_alloc_master(&pdev->dev, sizeof(*spi100k)); |
402 | if (master == NULL) { | 404 | if (master == NULL) { |
403 | dev_dbg(&pdev->dev, "master allocation failed\n"); | 405 | dev_dbg(&pdev->dev, "master allocation failed\n"); |
404 | return -ENOMEM; | 406 | return -ENOMEM; |
405 | } | 407 | } |
406 | 408 | ||
407 | if (pdev->id != -1) | 409 | if (pdev->id != -1) |
408 | master->bus_num = pdev->id; | 410 | master->bus_num = pdev->id; |
409 | 411 | ||
410 | master->setup = omap1_spi100k_setup; | 412 | master->setup = omap1_spi100k_setup; |
411 | master->transfer_one_message = omap1_spi100k_transfer_one_message; | 413 | master->transfer_one_message = omap1_spi100k_transfer_one_message; |