From: Jarkko Nikula Date: Tue, 17 Apr 2018 14:20:01 +0000 (+0300) Subject: spi: pxa2xx: Remove pump_transfers string from dev_ prints X-Git-Tag: Ubuntu-5.2.0-15.16~4332^2~38 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd;p=mirror_ubuntu-eoan-kernel.git 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 Signed-off-by: Mark Brown --- 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;