diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2017-01-13 07:50:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-01-17 13:27:38 -0500 |
commit | 31ae779421098e9a58a3f10e1e09b2c63f4514fa (patch) | |
tree | fc52e14052db40e0c4507348cf7c92d8e75a429e | |
parent | 5223db0b10c7917d7c6b4f7d8e2c0af0eb1158f5 (diff) |
spi: fsl: Combine substrings for two messages
The script "checkpatch.pl" pointed information out like the following.
WARNING: quoted string split across lines
Thus fix the affected source code places.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-fsl-spi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c index cdee556037f9..0fc3452652ae 100644 --- a/drivers/spi/spi-fsl-spi.c +++ b/drivers/spi/spi-fsl-spi.c | |||
@@ -267,10 +267,9 @@ static int fsl_spi_setup_transfer(struct spi_device *spi, | |||
267 | if ((mpc8xxx_spi->spibrg / hz) > 64) { | 267 | if ((mpc8xxx_spi->spibrg / hz) > 64) { |
268 | cs->hw_mode |= SPMODE_DIV16; | 268 | cs->hw_mode |= SPMODE_DIV16; |
269 | pm = (mpc8xxx_spi->spibrg - 1) / (hz * 64) + 1; | 269 | pm = (mpc8xxx_spi->spibrg - 1) / (hz * 64) + 1; |
270 | 270 | WARN_ONCE(pm > 16, | |
271 | WARN_ONCE(pm > 16, "%s: Requested speed is too low: %d Hz. " | 271 | "%s: Requested speed is too low: %d Hz. Will use %d Hz instead.\n", |
272 | "Will use %d Hz instead.\n", dev_name(&spi->dev), | 272 | dev_name(&spi->dev), hz, mpc8xxx_spi->spibrg / 1024); |
273 | hz, mpc8xxx_spi->spibrg / 1024); | ||
274 | if (pm > 16) | 273 | if (pm > 16) |
275 | pm = 16; | 274 | pm = 16; |
276 | } else { | 275 | } else { |
@@ -763,8 +762,9 @@ static int of_fsl_spi_get_chipselects(struct device *dev) | |||
763 | ret = gpio_direction_output(pinfo->gpios[i], | 762 | ret = gpio_direction_output(pinfo->gpios[i], |
764 | pinfo->alow_flags[i]); | 763 | pinfo->alow_flags[i]); |
765 | if (ret) { | 764 | if (ret) { |
766 | dev_err(dev, "can't set output direction for gpio " | 765 | dev_err(dev, |
767 | "#%d: %d\n", i, ret); | 766 | "can't set output direction for gpio #%d: %d\n", |
767 | i, ret); | ||
768 | goto err_loop; | 768 | goto err_loop; |
769 | } | 769 | } |
770 | } | 770 | } |