spi: davinci: removed unused #defines

[linux-2.6-microblaze.git] / drivers / spi / davinci_spi.c

diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index b85090c..7bd0a55 100644 (file)
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -54,16 +54,12 @@
 #define SPIFMT_WDELAY_SHIFT    24
 #define SPIFMT_CHARLEN_MASK    0x0000001Fu
 
-/* SPIGCR1 */
-#define SPIGCR1_SPIENA_MASK    0x01000000u
 
 /* SPIPC0 */
 #define SPIPC0_DIFUN_MASK      BIT(11)         /* MISO */
 #define SPIPC0_DOFUN_MASK      BIT(10)         /* MOSI */
 #define SPIPC0_CLKFUN_MASK     BIT(9)          /* CLK */
 #define SPIPC0_SPIENA_MASK     BIT(8)          /* nREADY */
-#define SPIPC0_EN1FUN_MASK     BIT(1)
-#define SPIPC0_EN0FUN_MASK     BIT(0)
 
 #define SPIINT_MASKALL         0x0101035F
 #define SPI_INTLVL_1           0x000001FFu
@@ -75,6 +71,7 @@
 #define SPIGCR1_CLKMOD_MASK    BIT(1)
 #define SPIGCR1_MASTER_MASK     BIT(0)
 #define SPIGCR1_LOOPBACK_MASK  BIT(16)
+#define SPIGCR1_SPIENA_MASK    BIT(24)
 
 /* SPIBUF */
 #define SPIBUF_TXFULL_MASK     BIT(29)
@@ -90,23 +87,12 @@
 #define SPIFLG_RX_INTR_MASK            BIT(8)
 #define SPIFLG_TX_INTR_MASK            BIT(9)
 #define SPIFLG_BUF_INIT_ACTIVE_MASK    BIT(24)
-#define SPIFLG_MASK                    (SPIFLG_DLEN_ERR_MASK \
-                               | SPIFLG_TIMEOUT_MASK | SPIFLG_PARERR_MASK \
-                               | SPIFLG_DESYNC_MASK | SPIFLG_BITERR_MASK \
-                               | SPIFLG_OVRRUN_MASK | SPIFLG_RX_INTR_MASK \
-                               | SPIFLG_TX_INTR_MASK \
-                               | SPIFLG_BUF_INIT_ACTIVE_MASK)
-
-#define SPIINT_DLEN_ERR_INTR   BIT(0)
-#define SPIINT_TIMEOUT_INTR    BIT(1)
-#define SPIINT_PARERR_INTR     BIT(2)
-#define SPIINT_DESYNC_INTR     BIT(3)
+
 #define SPIINT_BITERR_INTR     BIT(4)
 #define SPIINT_OVRRUN_INTR     BIT(6)
 #define SPIINT_RX_INTR         BIT(8)
 #define SPIINT_TX_INTR         BIT(9)
 #define SPIINT_DMA_REQ_EN      BIT(16)
-#define SPIINT_ENABLE_HIGHZ    BIT(24)
 
 #define SPI_T2CDELAY_SHIFT     16
 #define SPI_C2TDELAY_SHIFT     24
@@ -118,26 +104,11 @@
 #define SPILVL         0x0c
 #define SPIFLG         0x10
 #define SPIPC0         0x14
-#define SPIPC1         0x18
-#define SPIPC2         0x1c
-#define SPIPC3         0x20
-#define SPIPC4         0x24
-#define SPIPC5         0x28
-#define SPIPC6         0x2c
-#define SPIPC7         0x30
-#define SPIPC8         0x34
-#define SPIDAT0                0x38
 #define SPIDAT1                0x3c
 #define SPIBUF         0x40
-#define SPIEMU         0x44
 #define SPIDELAY       0x48
 #define SPIDEF         0x4c
 #define SPIFMT0                0x50
-#define SPIFMT1                0x54
-#define SPIFMT2                0x58
-#define SPIFMT3                0x5c
-#define TGINTVEC0      0x60
-#define TGINTVEC1      0x64
 
 struct davinci_spi_slave {
        u32     cmd_to_write;
@@ -175,7 +146,7 @@ struct davinci_spi {
        u8                      *tmp_buf;
        int                     count;
        struct davinci_spi_dma  *dma_channels;
-       struct                  davinci_spi_platform_data *pdata;
+       struct davinci_spi_platform_data *pdata;
 
        void                    (*get_rx)(u32 rx_data, struct davinci_spi *);
        u32                     (*get_tx)(struct davinci_spi *);
@@ -299,12 +270,10 @@ static int davinci_spi_setup_transfer(struct spi_device *spi,
 {
 
        struct davinci_spi *davinci_spi;
-       struct davinci_spi_platform_data *pdata;
        u8 bits_per_word = 0;
        u32 hz = 0, prescale = 0, clkspeed;
 
        davinci_spi = spi_master_get_devdata(spi->master);
-       pdata = davinci_spi->pdata;
 
        if (t) {
                bits_per_word = t->bits_per_word;
@@ -357,11 +326,9 @@ static void davinci_spi_dma_rx_callback(unsigned lch, u16 ch_status, void *data)
        struct spi_device *spi = (struct spi_device *)data;
        struct davinci_spi *davinci_spi;
        struct davinci_spi_dma *davinci_spi_dma;
-       struct davinci_spi_platform_data *pdata;
 
        davinci_spi = spi_master_get_devdata(spi->master);
        davinci_spi_dma = &(davinci_spi->dma_channels[spi->chip_select]);
-       pdata = davinci_spi->pdata;
 
        if (ch_status == DMA_COMPLETE)
                edma_stop(davinci_spi_dma->dma_rx_channel);
@@ -378,11 +345,9 @@ static void davinci_spi_dma_tx_callback(unsigned lch, u16 ch_status, void *data)
        struct spi_device *spi = (struct spi_device *)data;
        struct davinci_spi *davinci_spi;
        struct davinci_spi_dma *davinci_spi_dma;
-       struct davinci_spi_platform_data *pdata;
 
        davinci_spi = spi_master_get_devdata(spi->master);
        davinci_spi_dma = &(davinci_spi->dma_channels[spi->chip_select]);
-       pdata = davinci_spi->pdata;
 
        if (ch_status == DMA_COMPLETE)
                edma_stop(davinci_spi_dma->dma_tx_channel);
@@ -398,13 +363,11 @@ static int davinci_spi_request_dma(struct spi_device *spi)
 {
        struct davinci_spi *davinci_spi;
        struct davinci_spi_dma *davinci_spi_dma;
-       struct davinci_spi_platform_data *pdata;
        struct device *sdev;
        int r;
 
        davinci_spi = spi_master_get_devdata(spi->master);
        davinci_spi_dma = &davinci_spi->dma_channels[spi->chip_select];
-       pdata = davinci_spi->pdata;
        sdev = davinci_spi->bitbang.master->dev.parent;
 
        r = edma_alloc_channel(davinci_spi_dma->dma_rx_sync_dev,
@@ -435,7 +398,6 @@ static int davinci_spi_request_dma(struct spi_device *spi)
  *
  * This functions sets the default transfer method.
  */
-
 static int davinci_spi_setup(struct spi_device *spi)
 {
        int retval;
@@ -1096,7 +1058,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
        }
        clk_enable(davinci_spi->clk);
 
-
        master->bus_num = pdev->id;
        master->num_chipselect = pdata->num_chipselect;
        master->setup = davinci_spi_setup;
@@ -1113,15 +1074,15 @@ static int davinci_spi_probe(struct platform_device *pdev)
                davinci_spi->bitbang.flags |= SPI_READY;
 
        if (use_dma) {
-                       r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-                       if (r)
-                               dma_rx_chan = r->start;
-                       r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
-                       if (r)
-                               dma_tx_chan = r->start;
-                       r = platform_get_resource(pdev, IORESOURCE_DMA, 2);
-                       if (r)
-                               dma_eventq = r->start;
+               r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+               if (r)
+                       dma_rx_chan = r->start;
+               r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+               if (r)
+                       dma_tx_chan = r->start;
+               r = platform_get_resource(pdev, IORESOURCE_DMA, 2);
+               if (r)
+                       dma_eventq = r->start;
        }
 
        if (!use_dma ||
@@ -1184,7 +1145,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
        if (ret)
                goto free_clk;
 
-       dev_info(&pdev->dev, "Controller at 0x%p \n", davinci_spi->base);
+       dev_info(&pdev->dev, "Controller at 0x%p\n", davinci_spi->base);
 
        if (!pdata->poll_mode)
                dev_info(&pdev->dev, "Operating in interrupt mode"