On Mon, Aug 9, 2010 at 4:36 AM, Felipe Balbi <felipe.balbi@xxxxxxxxx> wrote:
> On Thu, Jun 03, 2010 at 01:09:01PM +0200, Balbi Felipe (Nokia-D/Helsinki)
> wrote:
>>
>> From: Felipe Balbi <felipe.balbi@xxxxxxxxx>
>>
>> dev_vdbg() is only compiled when VERBOSE is defined, so
>> there's no need to wrap dev_dbg() on #ifdef VERBOSE .. #endif
>> as we can use dev_vdbg() directly.
>>
>> Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
>> ---
>
> ping, any comments to this one ? It's been pending for quite a long time.
It didn't get sent to the spi-devel-general list, so it didn't get
picked up by patchwork and wasn't there for me to pick up when I was
collecting stuff for .36.
g.
>
>> drivers/spi/omap2_mcspi.c | 36 +++++++++---------------------------
>> 1 files changed, 9 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
>> index b3a94ca..d703927 100644
>> --- a/drivers/spi/omap2_mcspi.c
>> +++ b/drivers/spi/omap2_mcspi.c
>> @@ -489,10 +489,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> dev_err(&spi->dev, "TXS timed
>> out\n");
>> goto out;
>> }
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "write-%d %02x\n",
>> + dev_vdbg(&spi->dev, "write-%d %02x\n",
>> word_len, *tx);
>> -#endif
>> __raw_writel(*tx++, tx_reg);
>> }
>> if (rx != NULL) {
>> @@ -506,10 +504,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> (l & OMAP2_MCSPI_CHCONF_TURBO)) {
>> omap2_mcspi_set_enable(spi, 0);
>> *rx++ = __raw_readl(rx_reg);
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "read-%d
>> %02x\n",
>> + dev_vdbg(&spi->dev, "read-%d
>> %02x\n",
>> word_len, *(rx - 1));
>> -#endif
>> if
>> (mcspi_wait_for_reg_bit(chstat_reg,
>> OMAP2_MCSPI_CHSTAT_RXS) <
>> 0) {
>> dev_err(&spi->dev,
>> @@ -522,10 +518,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> }
>>
>> *rx++ = __raw_readl(rx_reg);
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "read-%d %02x\n",
>> + dev_vdbg(&spi->dev, "read-%d %02x\n",
>> word_len, *(rx - 1));
>> -#endif
>> }
>> } while (c);
>> } else if (word_len <= 16) {
>> @@ -542,10 +536,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> dev_err(&spi->dev, "TXS timed
>> out\n");
>> goto out;
>> }
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "write-%d %04x\n",
>> + dev_vdbg(&spi->dev, "write-%d %04x\n",
>> word_len, *tx);
>> -#endif
>> __raw_writel(*tx++, tx_reg);
>> }
>> if (rx != NULL) {
>> @@ -559,10 +551,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> (l & OMAP2_MCSPI_CHCONF_TURBO)) {
>> omap2_mcspi_set_enable(spi, 0);
>> *rx++ = __raw_readl(rx_reg);
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "read-%d
>> %04x\n",
>> + dev_vdbg(&spi->dev, "read-%d
>> %04x\n",
>> word_len, *(rx - 1));
>> -#endif
>> if
>> (mcspi_wait_for_reg_bit(chstat_reg,
>> OMAP2_MCSPI_CHSTAT_RXS) <
>> 0) {
>> dev_err(&spi->dev,
>> @@ -575,10 +565,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> }
>>
>> *rx++ = __raw_readl(rx_reg);
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "read-%d %04x\n",
>> + dev_vdbg(&spi->dev, "read-%d %04x\n",
>> word_len, *(rx - 1));
>> -#endif
>> }
>> } while (c);
>> } else if (word_len <= 32) {
>> @@ -595,10 +583,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> dev_err(&spi->dev, "TXS timed
>> out\n");
>> goto out;
>> }
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "write-%d %08x\n",
>> + dev_vdbg(&spi->dev, "write-%d %08x\n",
>> word_len, *tx);
>> -#endif
>> __raw_writel(*tx++, tx_reg);
>> }
>> if (rx != NULL) {
>> @@ -612,10 +598,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> (l & OMAP2_MCSPI_CHCONF_TURBO)) {
>> omap2_mcspi_set_enable(spi, 0);
>> *rx++ = __raw_readl(rx_reg);
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "read-%d
>> %08x\n",
>> + dev_vdbg(&spi->dev, "read-%d
>> %08x\n",
>> word_len, *(rx - 1));
>> -#endif
>> if
>> (mcspi_wait_for_reg_bit(chstat_reg,
>> OMAP2_MCSPI_CHSTAT_RXS) <
>> 0) {
>> dev_err(&spi->dev,
>> @@ -628,10 +612,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct
>> spi_transfer *xfer)
>> }
>>
>> *rx++ = __raw_readl(rx_reg);
>> -#ifdef VERBOSE
>> - dev_dbg(&spi->dev, "read-%d %08x\n",
>> + dev_vdbg(&spi->dev, "read-%d %08x\n",
>> word_len, *(rx - 1));
>> -#endif
>> }
>> } while (c);
>> }
>> --
>> 1.7.1
>
> --
> balbi
>
> DefectiveByDesign.org
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
ÿôèº{.nÇ+?·?®??+%?Ëÿ±éݶ¥?wÿº{.nÇ+?·¥?{±þ??§ø§¶?¡Ü¨}©?²Æ zÚ&j:+v?¨þø ¯ù ®w¥þ?à2?Þ?¨èÚ&¢)ß¡«a¶Úÿÿûàz¿äz¹Þ?ú+?ù???Ý¢jÿ?wèþf
