aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-07-11 12:13:25 -0400
committerMark Brown <broonie@linaro.org>2014-07-16 18:22:14 -0400
commit2857d80acad4707c17876958642bf0592235a8d7 (patch)
tree5cf32d2f853a7c9de80b7ccb608f1cd56770972d
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
spi: topcliff-pch: Update error messages for dmaengine_prep_slave_sg() API
Commit 16052827d98fbc13c31ebad560af4bd53e2b4dd5 ("dmaengine/dma_slave: introduce inline wrappers") changed the code to use the new API, but forgot to update the error messages. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -- v2: - New Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-topcliff-pch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index f05abf89c067..af51d6a71cc8 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1047,8 +1047,8 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
1047 num, DMA_DEV_TO_MEM, 1047 num, DMA_DEV_TO_MEM,
1048 DMA_PREP_INTERRUPT | DMA_CTRL_ACK); 1048 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
1049 if (!desc_rx) { 1049 if (!desc_rx) {
1050 dev_err(&data->master->dev, "%s:device_prep_slave_sg Failed\n", 1050 dev_err(&data->master->dev,
1051 __func__); 1051 "%s:dmaengine_prep_slave_sg Failed\n", __func__);
1052 return; 1052 return;
1053 } 1053 }
1054 dma_sync_sg_for_device(&data->master->dev, sg, num, DMA_FROM_DEVICE); 1054 dma_sync_sg_for_device(&data->master->dev, sg, num, DMA_FROM_DEVICE);
@@ -1106,8 +1106,8 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
1106 sg, num, DMA_MEM_TO_DEV, 1106 sg, num, DMA_MEM_TO_DEV,
1107 DMA_PREP_INTERRUPT | DMA_CTRL_ACK); 1107 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
1108 if (!desc_tx) { 1108 if (!desc_tx) {
1109 dev_err(&data->master->dev, "%s:device_prep_slave_sg Failed\n", 1109 dev_err(&data->master->dev,
1110 __func__); 1110 "%s:dmaengine_prep_slave_sg Failed\n", __func__);
1111 return; 1111 return;
1112 } 1112 }
1113 dma_sync_sg_for_device(&data->master->dev, sg, num, DMA_TO_DEVICE); 1113 dma_sync_sg_for_device(&data->master->dev, sg, num, DMA_TO_DEVICE);