Staging: et131x: kill MSI type
Kill off the MSI structure
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 936e5e6c..33f4995 100644
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -539,7 +539,7 @@
*/
void ConfigGlobalRegs(struct et131x_adapter *etdev)
{
- struct _GLOBAL_t __iomem *pGbl = &etdev->regs->global;
+ struct _GLOBAL_t __iomem *regs = &etdev->regs->global;
DBG_ENTER(et131x_dbginfo);
@@ -550,52 +550,52 @@
* and Rx as it desires. Our default is to split it
* 50/50:
*/
- writel(0, &pGbl->rxq_start_addr);
- writel(PARM_RX_MEM_END_DEF, &pGbl->rxq_end_addr);
- writel(PARM_RX_MEM_END_DEF + 1, &pGbl->txq_start_addr);
- writel(INTERNAL_MEM_SIZE - 1, &pGbl->txq_end_addr);
+ writel(0, ®s->rxq_start_addr);
+ writel(PARM_RX_MEM_END_DEF, ®s->rxq_end_addr);
+ writel(PARM_RX_MEM_END_DEF + 1, ®s->txq_start_addr);
+ writel(INTERNAL_MEM_SIZE - 1, ®s->txq_end_addr);
} else if (etdev->RegistryJumboPacket < 8192) {
/* For jumbo packets > 2k but < 8k, split 50-50. */
- writel(0, &pGbl->rxq_start_addr);
- writel(INTERNAL_MEM_RX_OFFSET, &pGbl->rxq_end_addr);
- writel(INTERNAL_MEM_RX_OFFSET + 1, &pGbl->txq_start_addr);
- writel(INTERNAL_MEM_SIZE - 1, &pGbl->txq_end_addr);
+ writel(0, ®s->rxq_start_addr);
+ writel(INTERNAL_MEM_RX_OFFSET, ®s->rxq_end_addr);
+ writel(INTERNAL_MEM_RX_OFFSET + 1, ®s->txq_start_addr);
+ writel(INTERNAL_MEM_SIZE - 1, ®s->txq_end_addr);
} else {
/* 9216 is the only packet size greater than 8k that
* is available. The Tx buffer has to be big enough
* for one whole packet on the Tx side. We'll make
* the Tx 9408, and give the rest to Rx
*/
- writel(0x0000, &pGbl->rxq_start_addr);
- writel(0x01b3, &pGbl->rxq_end_addr);
- writel(0x01b4, &pGbl->txq_start_addr);
- writel(INTERNAL_MEM_SIZE - 1,&pGbl->txq_end_addr);
+ writel(0x0000, ®s->rxq_start_addr);
+ writel(0x01b3, ®s->rxq_end_addr);
+ writel(0x01b4, ®s->txq_start_addr);
+ writel(INTERNAL_MEM_SIZE - 1,®s->txq_end_addr);
}
/* Initialize the loopback register. Disable all loopbacks. */
- writel(0, &pGbl->loopback.value);
+ writel(0, ®s->loopback.value);
} else {
/* For PHY Line loopback, the memory is configured as if Tx
* and Rx both have all the memory. This is because the
* RxMAC will write data into the space, and the TxMAC will
* read it out.
*/
- writel(0, &pGbl->rxq_start_addr);
- writel(INTERNAL_MEM_SIZE - 1, &pGbl->rxq_end_addr);
- writel(0, &pGbl->txq_start_addr);
- writel(INTERNAL_MEM_SIZE - 1, &pGbl->txq_end_addr);
+ writel(0, ®s->rxq_start_addr);
+ writel(INTERNAL_MEM_SIZE - 1, ®s->rxq_end_addr);
+ writel(0, ®s->txq_start_addr);
+ writel(INTERNAL_MEM_SIZE - 1, ®s->txq_end_addr);
/* Initialize the loopback register (MAC loopback). */
- writel(1, &pGbl->loopback);
+ writel(1, ®s->loopback);
}
/* MSI Register */
- writel(0, &pGbl->msi_config.value);
+ writel(0, ®s->msi_config);
/* By default, disable the watchdog timer. It will be enabled when
* a packet is queued.
*/
- writel(0, &pGbl->watchdog_timer);
+ writel(0, ®s->watchdog_timer);
DBG_LEAVE(et131x_dbginfo);
}