[package] add Marvell orion watchdog timer module

[openwrt.git] / target / linux / ar71xx / files / drivers / spi / rb4xx_spi.c

diff --git a/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c b/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c
index 731f501..f7f148a 100644 (file)
--- a/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c
+++ b/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c
@@ -95,11 +95,9 @@ static void do_spi_byte(void __iomem *base, unsigned char byte)
        do_spi_clk(base, byte >> 1);
        do_spi_clk(base, byte);
 
        do_spi_clk(base, byte >> 1);
        do_spi_clk(base, byte);
 

-#ifdef RB4XX_SPI_DEBUG
-       printk("spi_byte sent 0x%02x got 0x%02x\n",
+       pr_debug("spi_byte sent 0x%02x got 0x%02x\n",

               (unsigned)byte,
               (unsigned char)__raw_readl(base + SPI_REG_RDS));
               (unsigned)byte,
               (unsigned char)__raw_readl(base + SPI_REG_RDS));

-#endif

 }
 
 static inline void do_spi_clk_fast(void __iomem *base, unsigned bit1,
 }
 
 static inline void do_spi_clk_fast(void __iomem *base, unsigned bit1,


@@ -121,11 +119,9 @@ static void do_spi_byte_fast(void __iomem *base, unsigned char byte)
        do_spi_clk_fast(base, byte >> 3, byte >> 2);
        do_spi_clk_fast(base, byte >> 1, byte >> 0);
 
        do_spi_clk_fast(base, byte >> 3, byte >> 2);
        do_spi_clk_fast(base, byte >> 1, byte >> 0);
 

-#ifdef RB4XX_SPI_DEBUG
-       printk("spi_byte_fast sent 0x%02x got 0x%02x\n",
+       pr_debug("spi_byte_fast sent 0x%02x got 0x%02x\n",

               (unsigned)byte,
               (unsigned char) __raw_readl(base + SPI_REG_RDS));
               (unsigned)byte,
               (unsigned char) __raw_readl(base + SPI_REG_RDS));

-#endif

 }
 
 static int rb4xx_spi_txrx(void __iomem *base, struct spi_transfer *t)
 }
 
 static int rb4xx_spi_txrx(void __iomem *base, struct spi_transfer *t)


@@ -135,12 +131,10 @@ static int rb4xx_spi_txrx(void __iomem *base, struct spi_transfer *t)
        unsigned char *rx_ptr = t->rx_buf;
        unsigned i;
 
        unsigned char *rx_ptr = t->rx_buf;
        unsigned i;
 

-#ifdef RB4XX_SPI_DEBUG
-       printk("spi_txrx len %u tx %u rx %u\n",
+       pr_debug("spi_txrx len %u tx %u rx %u\n",

               t->len,
               (t->tx_buf ? 1 : 0),
               (t->rx_buf ? 1 : 0));
               t->len,
               (t->tx_buf ? 1 : 0),
               (t->rx_buf ? 1 : 0));

-#endif

 
        if (t->verify) {
                rxv_ptr = tx_ptr;
 
        if (t->verify) {
                rxv_ptr = tx_ptr;


@@ -247,7 +241,7 @@ static int rb4xx_spi_msg(struct rb4xx_spi *rbspi, struct spi_message *m)
        __raw_writel(SPI_CTRL_FASTEST, base + SPI_REG_CTRL);
        do_spi_init(m->spi);
 
        __raw_writel(SPI_CTRL_FASTEST, base + SPI_REG_CTRL);
        do_spi_init(m->spi);
 

-       list_for_each_entry (t, &m->transfers, transfer_list) {
+       list_for_each_entry(t, &m->transfers, transfer_list) {

                int len;
 
                len = rb4xx_spi_txrx(base, t);
                int len;
 
                len = rb4xx_spi_txrx(base, t);


@@ -338,13 +332,13 @@ static int rb4xx_spi_setup(struct spi_device *spi)
 
        if (spi->mode & ~(SPI_CS_HIGH)) {
                dev_err(&spi->dev, "mode %x not supported\n",
 
        if (spi->mode & ~(SPI_CS_HIGH)) {
                dev_err(&spi->dev, "mode %x not supported\n",

-                       (unsigned) spi->mode);
+                       (unsigned) spi->mode);

                return -EINVAL;
        }
 
        if (spi->bits_per_word != 8 && spi->bits_per_word != 0) {
                dev_err(&spi->dev, "bits_per_word %u not supported\n",
                return -EINVAL;
        }
 
        if (spi->bits_per_word != 8 && spi->bits_per_word != 0) {
                dev_err(&spi->dev, "bits_per_word %u not supported\n",

-                       (unsigned) spi->bits_per_word);
+                       (unsigned) spi->bits_per_word);

                return -EINVAL;
        }
 
                return -EINVAL;
        }
 


@@ -432,12 +426,12 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
 
        return 0;
 
 
        return 0;
 

- err_iounmap:
+err_iounmap:

        iounmap(rbspi->base);
        iounmap(rbspi->base);

- err_put_master:
+err_put_master:

        platform_set_drvdata(pdev, NULL);
        spi_master_put(master);
        platform_set_drvdata(pdev, NULL);
        spi_master_put(master);

- err_out:
+err_out:

        return err;
 }
 
        return err;
 }
 


@@ -455,10 +449,10 @@ static int rb4xx_spi_remove(struct platform_device *pdev)
 static struct platform_driver rb4xx_spi_drv = {
        .probe          = rb4xx_spi_probe,
        .remove         = rb4xx_spi_remove,
 static struct platform_driver rb4xx_spi_drv = {
        .probe          = rb4xx_spi_probe,
        .remove         = rb4xx_spi_remove,

-        .driver                = {
+       .driver         = {

                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,

-        },
+       },

 };
 
 static int __init rb4xx_spi_init(void)
 };
 
 static int __init rb4xx_spi_init(void)