FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-20 08:22:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi: omap2_mcspi: make use of dev_vdbg()

Browse Source 
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@nokia.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Felipe Balbi 2010-09-29 17:31:29 +09:00 committed by Grant Likely
parent 899611ee7d
commit 079a176d87
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/spi/omap2_mcspi.c
View File

@ -489,10 +489,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
dev_err(&spi->dev, "TXS timed out\n"); dev_err(&spi->dev, "TXS timed out\n");
goto out; goto out;
} }
#ifdef VERBOSE dev_vdbg(&spi->dev, "write-%d %02x\n",
dev_dbg(&spi->dev, "write-%d %02x\n",
word_len, *tx); word_len, *tx);
#endif
__raw_writel(*tx++, tx_reg); __raw_writel(*tx++, tx_reg);
} }
if (rx != NULL) { if (rx != NULL) {
@ -506,10 +504,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
(l & OMAP2_MCSPI_CHCONF_TURBO)) { (l & OMAP2_MCSPI_CHCONF_TURBO)) {
omap2_mcspi_set_enable(spi, 0); omap2_mcspi_set_enable(spi, 0);
*rx++ = __raw_readl(rx_reg); *rx++ = __raw_readl(rx_reg);
#ifdef VERBOSE dev_vdbg(&spi->dev, "read-%d %02x\n",
dev_dbg(&spi->dev, "read-%d %02x\n",
word_len, *(rx - 1)); word_len, *(rx - 1));
#endif
if (mcspi_wait_for_reg_bit(chstat_reg, if (mcspi_wait_for_reg_bit(chstat_reg,
OMAP2_MCSPI_CHSTAT_RXS) < 0) { OMAP2_MCSPI_CHSTAT_RXS) < 0) {
dev_err(&spi->dev, 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); *rx++ = __raw_readl(rx_reg);
#ifdef VERBOSE dev_vdbg(&spi->dev, "read-%d %02x\n",
dev_dbg(&spi->dev, "read-%d %02x\n",
word_len, *(rx - 1)); word_len, *(rx - 1));
#endif
} }
} while (c); } while (c);
} else if (word_len <= 16) { } 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"); dev_err(&spi->dev, "TXS timed out\n");
goto out; goto out;
} }
#ifdef VERBOSE dev_vdbg(&spi->dev, "write-%d %04x\n",
dev_dbg(&spi->dev, "write-%d %04x\n",
word_len, *tx); word_len, *tx);
#endif
__raw_writel(*tx++, tx_reg); __raw_writel(*tx++, tx_reg);
} }
if (rx != NULL) { if (rx != NULL) {
@ -559,10 +551,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
(l & OMAP2_MCSPI_CHCONF_TURBO)) { (l & OMAP2_MCSPI_CHCONF_TURBO)) {
omap2_mcspi_set_enable(spi, 0); omap2_mcspi_set_enable(spi, 0);
*rx++ = __raw_readl(rx_reg); *rx++ = __raw_readl(rx_reg);
#ifdef VERBOSE dev_vdbg(&spi->dev, "read-%d %04x\n",
dev_dbg(&spi->dev, "read-%d %04x\n",
word_len, *(rx - 1)); word_len, *(rx - 1));
#endif
if (mcspi_wait_for_reg_bit(chstat_reg, if (mcspi_wait_for_reg_bit(chstat_reg,
OMAP2_MCSPI_CHSTAT_RXS) < 0) { OMAP2_MCSPI_CHSTAT_RXS) < 0) {
dev_err(&spi->dev, 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); *rx++ = __raw_readl(rx_reg);
#ifdef VERBOSE dev_vdbg(&spi->dev, "read-%d %04x\n",
dev_dbg(&spi->dev, "read-%d %04x\n",
word_len, *(rx - 1)); word_len, *(rx - 1));
#endif
} }
} while (c); } while (c);
} else if (word_len <= 32) { } 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"); dev_err(&spi->dev, "TXS timed out\n");
goto out; goto out;
} }
#ifdef VERBOSE dev_vdbg(&spi->dev, "write-%d %08x\n",
dev_dbg(&spi->dev, "write-%d %08x\n",
word_len, *tx); word_len, *tx);
#endif
__raw_writel(*tx++, tx_reg); __raw_writel(*tx++, tx_reg);
} }
if (rx != NULL) { if (rx != NULL) {
@ -612,10 +598,8 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
(l & OMAP2_MCSPI_CHCONF_TURBO)) { (l & OMAP2_MCSPI_CHCONF_TURBO)) {
omap2_mcspi_set_enable(spi, 0); omap2_mcspi_set_enable(spi, 0);
*rx++ = __raw_readl(rx_reg); *rx++ = __raw_readl(rx_reg);
#ifdef VERBOSE dev_vdbg(&spi->dev, "read-%d %08x\n",
dev_dbg(&spi->dev, "read-%d %08x\n",
word_len, *(rx - 1)); word_len, *(rx - 1));
#endif
if (mcspi_wait_for_reg_bit(chstat_reg, if (mcspi_wait_for_reg_bit(chstat_reg,
OMAP2_MCSPI_CHSTAT_RXS) < 0) { OMAP2_MCSPI_CHSTAT_RXS) < 0) {
dev_err(&spi->dev, 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); *rx++ = __raw_readl(rx_reg);
#ifdef VERBOSE dev_vdbg(&spi->dev, "read-%d %08x\n",
dev_dbg(&spi->dev, "read-%d %08x\n",
word_len, *(rx - 1)); word_len, *(rx - 1));
#endif
} }
} while (c); } while (c);
} }