diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2018-04-17 10:20:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-04-17 12:11:25 -0400 |
commit | 8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd (patch) | |
tree | d470b4e7bba725cc6018bf1a5aaa49f91a496d26 /drivers/spi | |
parent | 1f99f8938bcd90d1b98d66b4ec6e2585ead488f2 (diff) |
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 10 |
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) | |||
1029 | if (message->is_dma_mapped | 1029 | if (message->is_dma_mapped |
1030 | || transfer->rx_dma || transfer->tx_dma) { | 1030 | || transfer->rx_dma || transfer->tx_dma) { |
1031 | dev_err(&drv_data->pdev->dev, | 1031 | dev_err(&drv_data->pdev->dev, |
1032 | "pump_transfers: mapped transfer length of " | 1032 | "Mapped transfer length of %u is greater than %d\n", |
1033 | "%u is greater than %d\n", | ||
1034 | transfer->len, MAX_DMA_LEN); | 1033 | transfer->len, MAX_DMA_LEN); |
1035 | message->status = -EINVAL; | 1034 | message->status = -EINVAL; |
1036 | giveback(drv_data); | 1035 | giveback(drv_data); |
@@ -1039,14 +1038,13 @@ static void pump_transfers(unsigned long data) | |||
1039 | 1038 | ||
1040 | /* warn ... we force this to PIO mode */ | 1039 | /* warn ... we force this to PIO mode */ |
1041 | dev_warn_ratelimited(&message->spi->dev, | 1040 | dev_warn_ratelimited(&message->spi->dev, |
1042 | "pump_transfers: DMA disabled for transfer length %ld " | 1041 | "DMA disabled for transfer length %ld greater than %d\n", |
1043 | "greater than %d\n", | ||
1044 | (long)drv_data->len, MAX_DMA_LEN); | 1042 | (long)drv_data->len, MAX_DMA_LEN); |
1045 | } | 1043 | } |
1046 | 1044 | ||
1047 | /* Setup the transfer state based on the type of transfer */ | 1045 | /* Setup the transfer state based on the type of transfer */ |
1048 | if (pxa2xx_spi_flush(drv_data) == 0) { | 1046 | if (pxa2xx_spi_flush(drv_data) == 0) { |
1049 | dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n"); | 1047 | dev_err(&drv_data->pdev->dev, "Flush failed\n"); |
1050 | message->status = -EIO; | 1048 | message->status = -EIO; |
1051 | giveback(drv_data); | 1049 | giveback(drv_data); |
1052 | return; | 1050 | return; |
@@ -1095,7 +1093,7 @@ static void pump_transfers(unsigned long data) | |||
1095 | bits, &dma_burst, | 1093 | bits, &dma_burst, |
1096 | &dma_thresh)) | 1094 | &dma_thresh)) |
1097 | dev_warn_ratelimited(&message->spi->dev, | 1095 | dev_warn_ratelimited(&message->spi->dev, |
1098 | "pump_transfers: DMA burst size reduced to match bits_per_word\n"); | 1096 | "DMA burst size reduced to match bits_per_word\n"); |
1099 | } | 1097 | } |
1100 | 1098 | ||
1101 | message->state = RUNNING_STATE; | 1099 | message->state = RUNNING_STATE; |