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>
This commit is contained in:
Jarkko Nikula 2018-04-17 17:20:01 +03:00 committed by Mark Brown
parent 1f99f8938b
commit 8ae55af388
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 6 deletions

View File

@ -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)
/* 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)
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;