Commit 8ae55af3 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown

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: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1f99f893
...@@ -1029,8 +1029,7 @@ static void pump_transfers(unsigned long data) ...@@ -1029,8 +1029,7 @@ static void pump_transfers(unsigned long data)
if (message->is_dma_mapped if (message->is_dma_mapped
|| transfer->rx_dma || transfer->tx_dma) { || transfer->rx_dma || transfer->tx_dma) {
dev_err(&drv_data->pdev->dev, dev_err(&drv_data->pdev->dev,
"pump_transfers: mapped transfer length of " "Mapped transfer length of %u is greater than %d\n",
"%u is greater than %d\n",
transfer->len, MAX_DMA_LEN); transfer->len, MAX_DMA_LEN);
message->status = -EINVAL; message->status = -EINVAL;
giveback(drv_data); giveback(drv_data);
...@@ -1039,14 +1038,13 @@ static void pump_transfers(unsigned long data) ...@@ -1039,14 +1038,13 @@ static void pump_transfers(unsigned long data)
/* warn ... we force this to PIO mode */ /* warn ... we force this to PIO mode */
dev_warn_ratelimited(&message->spi->dev, dev_warn_ratelimited(&message->spi->dev,
"pump_transfers: DMA disabled for transfer length %ld " "DMA disabled for transfer length %ld greater than %d\n",
"greater than %d\n",
(long)drv_data->len, MAX_DMA_LEN); (long)drv_data->len, MAX_DMA_LEN);
} }
/* Setup the transfer state based on the type of transfer */ /* Setup the transfer state based on the type of transfer */
if (pxa2xx_spi_flush(drv_data) == 0) { 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; message->status = -EIO;
giveback(drv_data); giveback(drv_data);
return; return;
...@@ -1095,7 +1093,7 @@ static void pump_transfers(unsigned long data) ...@@ -1095,7 +1093,7 @@ static void pump_transfers(unsigned long data)
bits, &dma_burst, bits, &dma_burst,
&dma_thresh)) &dma_thresh))
dev_warn_ratelimited(&message->spi->dev, 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; message->state = RUNNING_STATE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment