diff options
author | Matthias Brugger <matthias.bgg@gmail.com> | 2013-01-24 07:28:58 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-26 03:59:34 -0500 |
commit | 18dd6199fa4527229cede5784244b6eb37a21d62 (patch) | |
tree | 4151b8c995f0da55056f2e539f503615a6f7a3e6 /drivers | |
parent | 0202a32d5f4a129ced47db76001f958cd33adeb7 (diff) |
spi: spi-omap2-mcspi.c: fix coding style
This patch fixes some indentation errors.
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index b610f522ca44..31f6e842ea86 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c | |||
@@ -1020,7 +1020,7 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m) | |||
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | static int omap2_mcspi_transfer_one_message(struct spi_master *master, | 1022 | static int omap2_mcspi_transfer_one_message(struct spi_master *master, |
1023 | struct spi_message *m) | 1023 | struct spi_message *m) |
1024 | { | 1024 | { |
1025 | struct omap2_mcspi *mcspi; | 1025 | struct omap2_mcspi *mcspi; |
1026 | struct spi_transfer *t; | 1026 | struct spi_transfer *t; |
@@ -1041,7 +1041,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, | |||
1041 | || (len && !(rx_buf || tx_buf)) | 1041 | || (len && !(rx_buf || tx_buf)) |
1042 | || (t->bits_per_word && | 1042 | || (t->bits_per_word && |
1043 | ( t->bits_per_word < 4 | 1043 | ( t->bits_per_word < 4 |
1044 | || t->bits_per_word > 32))) { | 1044 | || t->bits_per_word > 32))) { |
1045 | dev_dbg(mcspi->dev, "transfer: %d Hz, %d %s%s, %d bpw\n", | 1045 | dev_dbg(mcspi->dev, "transfer: %d Hz, %d %s%s, %d bpw\n", |
1046 | t->speed_hz, | 1046 | t->speed_hz, |
1047 | len, | 1047 | len, |
@@ -1052,8 +1052,8 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, | |||
1052 | } | 1052 | } |
1053 | if (t->speed_hz && t->speed_hz < (OMAP2_MCSPI_MAX_FREQ >> 15)) { | 1053 | if (t->speed_hz && t->speed_hz < (OMAP2_MCSPI_MAX_FREQ >> 15)) { |
1054 | dev_dbg(mcspi->dev, "speed_hz %d below minimum %d Hz\n", | 1054 | dev_dbg(mcspi->dev, "speed_hz %d below minimum %d Hz\n", |
1055 | t->speed_hz, | 1055 | t->speed_hz, |
1056 | OMAP2_MCSPI_MAX_FREQ >> 15); | 1056 | OMAP2_MCSPI_MAX_FREQ >> 15); |
1057 | return -EINVAL; | 1057 | return -EINVAL; |
1058 | } | 1058 | } |
1059 | 1059 | ||
@@ -1099,7 +1099,7 @@ static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi) | |||
1099 | return ret; | 1099 | return ret; |
1100 | 1100 | ||
1101 | mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE, | 1101 | mcspi_write_reg(master, OMAP2_MCSPI_WAKEUPENABLE, |
1102 | OMAP2_MCSPI_WAKEUPENABLE_WKEN); | 1102 | OMAP2_MCSPI_WAKEUPENABLE_WKEN); |
1103 | ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN; | 1103 | ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN; |
1104 | 1104 | ||
1105 | omap2_mcspi_set_master_mode(master); | 1105 | omap2_mcspi_set_master_mode(master); |
@@ -1228,7 +1228,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) | |||
1228 | 1228 | ||
1229 | sprintf(dma_ch_name, "rx%d", i); | 1229 | sprintf(dma_ch_name, "rx%d", i); |
1230 | dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA, | 1230 | dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA, |
1231 | dma_ch_name); | 1231 | dma_ch_name); |
1232 | if (!dma_res) { | 1232 | if (!dma_res) { |
1233 | dev_dbg(&pdev->dev, "cannot get DMA RX channel\n"); | 1233 | dev_dbg(&pdev->dev, "cannot get DMA RX channel\n"); |
1234 | status = -ENODEV; | 1234 | status = -ENODEV; |
@@ -1238,7 +1238,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) | |||
1238 | mcspi->dma_channels[i].dma_rx_sync_dev = dma_res->start; | 1238 | mcspi->dma_channels[i].dma_rx_sync_dev = dma_res->start; |
1239 | sprintf(dma_ch_name, "tx%d", i); | 1239 | sprintf(dma_ch_name, "tx%d", i); |
1240 | dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA, | 1240 | dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA, |
1241 | dma_ch_name); | 1241 | dma_ch_name); |
1242 | if (!dma_res) { | 1242 | if (!dma_res) { |
1243 | dev_dbg(&pdev->dev, "cannot get DMA TX channel\n"); | 1243 | dev_dbg(&pdev->dev, "cannot get DMA TX channel\n"); |
1244 | status = -ENODEV; | 1244 | status = -ENODEV; |
@@ -1254,7 +1254,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) | |||
1254 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | 1254 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); |
1255 | if (IS_ERR(pinctrl)) | 1255 | if (IS_ERR(pinctrl)) |
1256 | dev_warn(&pdev->dev, | 1256 | dev_warn(&pdev->dev, |
1257 | "pins are not configured from the driver\n"); | 1257 | "pins are not configured from the driver\n"); |
1258 | 1258 | ||
1259 | pm_runtime_use_autosuspend(&pdev->dev); | 1259 | pm_runtime_use_autosuspend(&pdev->dev); |
1260 | pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); | 1260 | pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); |