From: Felipe Balbi on
On Thu, Jun 03, 2010 at 01:09:01PM +0200, Balbi Felipe (Nokia-D/Helsinki) wrote:
>From: Felipe Balbi <felipe.balbi(a)nokia.com>
>
>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(a)nokia.com>
>---

ping, any comments to this one ? It's been pending for quite a long
time.

> 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(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Grant Likely on
On Mon, Aug 9, 2010 at 4:36 AM, Felipe Balbi <felipe.balbi(a)nokia.com> wrote:
> On Thu, Jun 03, 2010 at 01:09:01PM +0200, Balbi Felipe (Nokia-D/Helsinki)
> wrote:
>>
>> From: Felipe Balbi <felipe.balbi(a)nokia.com>
>>
>> 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(a)nokia.com>
>> ---
>
> 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.
From: Felipe Balbi on
Hi,

On Mon, Aug 09, 2010 at 03:22:31PM +0200, ext Grant Likely wrote:
>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.

that's subscribers only ? I couldn't bother subscribing to a list just
to send a small cleanup patch. Even though it didn't go to the list,
both maintainers are in Cc list and nobody even commented.

Anyways, could you, somehow, get an account on majordomo ?

--
balbi

DefectiveByDesign.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Grant Likely on
On Mon, Aug 9, 2010 at 11:21 PM, Felipe Balbi <felipe.balbi(a)nokia.com> wrote:
> Hi,
>
> On Mon, Aug 09, 2010 at 03:22:31PM +0200, ext Grant Likely wrote:
>>
>> 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.
>
> that's subscribers only ? I couldn't bother subscribing to a list just to
> send a small cleanup patch. Even though it didn't go to the list, both
> maintainers are in Cc list and nobody even commented.

My inbox gets very full. If it isn't in patchwork then I tend to lose it.

> Anyways, could you, somehow, get an account on majordomo ?

I know, the sourceforge list is a bit of a pain. I don't even know
who the admin of that list is. It was set up before I started the SPI
maintainership. I've been thinking about creating a new spi list on
vger.kernel.org.

g.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Felipe Balbi on
Hi,

On Tue, Aug 10, 2010 at 07:27:43AM +0200, ext Grant Likely wrote:
>I know, the sourceforge list is a bit of a pain. I don't even know
>who the admin of that list is. It was set up before I started the SPI
>maintainership. I've been thinking about creating a new spi list on
>vger.kernel.org.

please do, that would make things a whole lot easier for plenty of
developers. Specially the ones who are just coming up with simple
patches once in a while :-)

--
balbi

DefectiveByDesign.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/