Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770Ab0HJGdv (ORCPT ); Tue, 10 Aug 2010 02:33:51 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:47851 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878Ab0HJGdo (ORCPT ); Tue, 10 Aug 2010 02:33:44 -0400 Date: Tue, 10 Aug 2010 00:33:41 -0600 From: Grant Likely To: Felipe Balbi Cc: "linux-kernel@vger.kernel.org" , Linux OMAP Mailing List , Tony Lindgren , "Tereshonkov Roman (Nokia-D/Helsinki)" , Andrew Morton , David Brownell , spi-devel-general@lists.sourceforge.net Subject: Re: [PATCH] spi: omap2_mcspi: make use of dev_vdbg() Message-ID: <20100810063341.GA28597@angua.secretlab.ca> References: <1275563341-31078-1-git-send-email-felipe.balbi@nokia.com> <20100809103618.GE11340@nokia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100809103618.GE11340@nokia.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4892 Lines: 146 On Mon, Aug 09, 2010 at 01:36:18PM +0300, Felipe Balbi wrote: > On Thu, Jun 03, 2010 at 01:09:01PM +0200, Balbi Felipe (Nokia-D/Helsinki) wrote: > >From: Felipe Balbi > > > >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 > >--- > > ping, any comments to this one ? It's been pending for quite a long > time. Now picked up into my test-spi branch. I'll add it to linux-next after the merge window closes. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/