staging: et131x: Replace rxdma csr register magic numbers with defines

Several magic numbers were used to represent rxdma csr register bitmasks.
Replace them with descriptive defines.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 84bbcd48e26489753ed30581980c93864fb3ace3..b08dff959234223085142f98ed357ab61a58dab0 100644 (file)
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -577,7 +577,6 @@ static int eeprom_wait_ready(struct pci_dev *pdev, u32 *status)
        return -ETIMEDOUT;
 }
 
-
 /**
  * eeprom_write - Write a byte to the ET1310's EEPROM
  * @adapter: pointer to our private adapter structure
@@ -843,29 +842,29 @@ static int et131x_init_eeprom(struct et131x_adapter *adapter)
 static void et131x_rx_dma_enable(struct et131x_adapter *adapter)
 {
        /* Setup the receive dma configuration register for normal operation */
-       u32 csr =  0x2000;      /* FBR1 enable */
+       u32 csr =  ET_RXDMA_CSR_FBR1_ENABLE;
 
        if (adapter->rx_ring.fbr[1]->buffsize == 4096)
-               csr |= 0x0800;
+               csr |= ET_RXDMA_CSR_FBR1_SIZE_LO;
        else if (adapter->rx_ring.fbr[1]->buffsize == 8192)
-               csr |= 0x1000;
+               csr |= ET_RXDMA_CSR_FBR1_SIZE_HI;
        else if (adapter->rx_ring.fbr[1]->buffsize == 16384)
-               csr |= 0x1800;
+               csr |= ET_RXDMA_CSR_FBR1_SIZE_LO | ET_RXDMA_CSR_FBR1_SIZE_HI;
 
-       csr |= 0x0400;          /* FBR0 enable */
+       csr |= ET_RXDMA_CSR_FBR0_ENABLE;
        if (adapter->rx_ring.fbr[0]->buffsize == 256)
-               csr |= 0x0100;
+               csr |= ET_RXDMA_CSR_FBR0_SIZE_LO;
        else if (adapter->rx_ring.fbr[0]->buffsize == 512)
-               csr |= 0x0200;
+               csr |= ET_RXDMA_CSR_FBR0_SIZE_HI;
        else if (adapter->rx_ring.fbr[0]->buffsize == 1024)
-               csr |= 0x0300;
+               csr |= ET_RXDMA_CSR_FBR0_SIZE_LO | ET_RXDMA_CSR_FBR0_SIZE_HI;
        writel(csr, &adapter->regs->rxdma.csr);
 
        csr = readl(&adapter->regs->rxdma.csr);
-       if (csr & 0x00020000) {
+       if (csr & ET_RXDMA_CSR_HALT_STATUS) {
                udelay(5);
                csr = readl(&adapter->regs->rxdma.csr);
-               if (csr & 0x00020000) {
+               if (csr & ET_RXDMA_CSR_HALT_STATUS) {
                        dev_err(&adapter->pdev->dev,
                            "RX Dma failed to exit halt state.  CSR 0x%08x\n",
                                csr);
@@ -881,15 +880,16 @@ static void et131x_rx_dma_disable(struct et131x_adapter *adapter)
 {
        u32 csr;
        /* Setup the receive dma configuration register */
-       writel(0x00002001, &adapter->regs->rxdma.csr);
+       writel(ET_RXDMA_CSR_HALT | ET_RXDMA_CSR_FBR1_ENABLE,
+              &adapter->regs->rxdma.csr);
        csr = readl(&adapter->regs->rxdma.csr);
-       if ((csr & 0x00020000) == 0) {  /* Check halt status (bit 17) */
+       if (!(csr & ET_RXDMA_CSR_HALT_STATUS)) {
                udelay(5);
                csr = readl(&adapter->regs->rxdma.csr);
-               if ((csr & 0x00020000) == 0)
+               if (!(csr & ET_RXDMA_CSR_HALT_STATUS))
                        dev_err(&adapter->pdev->dev,
-                       "RX Dma failed to enter halt state. CSR 0x%08x\n",
-                               csr);
+                             "RX Dma failed to enter halt state. CSR 0x%08x\n",
+                             csr);
        }
 }
 
@@ -2032,7 +2032,7 @@ static void et131x_disable_interrupts(struct et131x_adapter *adapter)
 static void et131x_tx_dma_disable(struct et131x_adapter *adapter)
 {
        /* Setup the tramsmit dma configuration register */
-       writel(ET_TXDMA_CSR_HALT|ET_TXDMA_SNGL_EPKT,
+       writel(ET_TXDMA_CSR_HALT | ET_TXDMA_SNGL_EPKT,
                                        &adapter->regs->txdma.csr);
 }
 

diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h
index 347e63ddde1fa1d1f2b112d1d10368ce4da5169e..9fa47f91a9f2ae95f5bd2c784c154804014928ac 100644 (file)
--- a/drivers/staging/et131x/et131x.h
+++ b/drivers/staging/et131x/et131x.h
@@ -317,6 +317,14 @@ struct txdma_regs {                        /* Location: */
  * 18-31: unused
  */
 
+#define ET_RXDMA_CSR_HALT              0x0001
+#define ET_RXDMA_CSR_FBR0_SIZE_LO      0x0100
+#define ET_RXDMA_CSR_FBR0_SIZE_HI      0x0200
+#define ET_RXDMA_CSR_FBR0_ENABLE       0x0400
+#define ET_RXDMA_CSR_FBR1_SIZE_LO      0x0800
+#define ET_RXDMA_CSR_FBR1_SIZE_HI      0x1000
+#define ET_RXDMA_CSR_FBR1_ENABLE       0x2000
+#define ET_RXDMA_CSR_HALT_STATUS       0x00020000
 
 /*
  * structure for dma writeback lo reg in rxdma address map