diff options
| author |   Alan Cox <alan@linux.intel.com> | 2009-08-27 10:59:30 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:27 -0700 |
| commit | f3f415a3b4f2982391c0e790b226b43793a8ae72 (patch) | |
| tree | 550ac0206ff27f5ce65999a132064ca65363539a /drivers/staging/et131x/et131x_isr.c | |
| parent | Staging: et131x: Take a kref for the PCI pointer we cache (diff) | |
| download | linux-dev-f3f415a3b4f2982391c0e790b226b43793a8ae72.tar.xz linux-dev-f3f415a3b4f2982391c0e790b226b43793a8ae72.zip | |
Staging: et131x: CSRAddress to regs
Switch this to a Linux like naming as it occurs all over.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_isr.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_isr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index f9687b344159..478569fcab12 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c @@ -129,7 +129,7 @@ irqreturn_t et131x_isr(int irq, void *dev_id) /* Get a copy of the value in the interrupt status register * so we can process the interrupting section */ - status.value = readl(&adapter->CSRAddress->global.int_status.value); + status.value = readl(&adapter->regs->global.int_status.value); if (adapter->FlowControl == TxOnly || adapter->FlowControl == Both) { @@ -168,7 +168,7 @@ irqreturn_t et131x_isr(int irq, void *dev_id) if (adapter->RxRing.UnfinishedReceives) status.bits.rxdma_xfr_done = 1; else if (pMpTcb == NULL) - writel(0, &adapter->CSRAddress->global.watchdog_timer); + writel(0, &adapter->regs->global.watchdog_timer); status.bits.watchdog_interrupt = 0; #ifdef CONFIG_ET131X_DEBUG @@ -214,7 +214,7 @@ void et131x_isr_handler(struct work_struct *work) struct et131x_adapter *etdev = container_of(work, struct et131x_adapter, task); INTERRUPT_t GlobStatus = etdev->Stats.InterruptStatus; - ADDRESS_MAP_t __iomem *iomem = etdev->CSRAddress; + ADDRESS_MAP_t __iomem *iomem = etdev->regs; /* * These first two are by far the most common. Once handled, we clear |