summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2018-04-17 17:20:01 +0300
committerMark Brown <broonie@kernel.org>2018-04-17 17:11:25 +0100
commit8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd (patch)
treed470b4e7bba725cc6018bf1a5aaa49f91a496d26
parent1f99f8938bcd90d1b98d66b4ec6e2585ead488f2 (diff)
downloadlinux-stable-8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd.tar.gz
linux-stable-8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd.tar.bz2
linux-stable-8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd.zip
spi: pxa2xx: Remove pump_transfers string from dev_ prints
We are going to rename and modify pump_transfers(). Prepare for it by removing the string "pump_transfers:" from error and warning prints. While at it make these user-visible strings single line in sources as it helps source grepping from error reports. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-pxa2xx.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index f4d4f5123189..e4930542bc4b 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1029,8 +1029,7 @@ static void pump_transfers(unsigned long data)
if (message->is_dma_mapped
|| transfer->rx_dma || transfer->tx_dma) {
dev_err(&drv_data->pdev->dev,
- "pump_transfers: mapped transfer length of "
- "%u is greater than %d\n",
+ "Mapped transfer length of %u is greater than %d\n",
transfer->len, MAX_DMA_LEN);
message->status = -EINVAL;
giveback(drv_data);
@@ -1039,14 +1038,13 @@ static void pump_transfers(unsigned long data)
/* warn ... we force this to PIO mode */
dev_warn_ratelimited(&message->spi->dev,
- "pump_transfers: DMA disabled for transfer length %ld "
- "greater than %d\n",
+ "DMA disabled for transfer length %ld greater than %d\n",
(long)drv_data->len, MAX_DMA_LEN);
}
/* Setup the transfer state based on the type of transfer */
if (pxa2xx_spi_flush(drv_data) == 0) {
- dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n");
+ dev_err(&drv_data->pdev->dev, "Flush failed\n");
message->status = -EIO;
giveback(drv_data);
return;
@@ -1095,7 +1093,7 @@ static void pump_transfers(unsigned long data)
bits, &dma_burst,
&dma_thresh))
dev_warn_ratelimited(&message->spi->dev,
- "pump_transfers: DMA burst size reduced to match bits_per_word\n");
+ "DMA burst size reduced to match bits_per_word\n");
}
message->state = RUNNING_STATE;