From 2e7f62b682397611694dc1fc0d112507aec8be2f Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Fri, 9 Mar 2012 19:13:48 +0100 Subject: [PATCH] --- yaml --- r: 300543 b: refs/heads/master c: 80777c54d2a6ebeff783b638e92fba40f0881ba5 h: refs/heads/master i: 300541: 29e4768257dad4b8b917a571a6f2037e5f2a200b 300539: f2a1398879536c116464eba7cccd04e98c29b881 300535: b0ddd15db860e3275d9bbb0098bcacfd49fa2dce 300527: 7fd31f9a702da00d2738d0805c231fb5dde59e19 300511: 69871384f0a4f53e3e83edd48666101fe20f3232 300479: f0407063d7961d8aa61379d931c5dc3d9f8eb573 300415: 815f0fde3473fb585709e613af569d7ea598719d 300287: c3107a3af6ff74005300545793fa9a6b722913e4 300031: aa4285495eaa682d2c2eff96b7a1def83d993250 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/neterion/s2io.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4907a8f0a68c..8bdc4d2335c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5efab99ed92dd3b432e2f414d3979e8c2acd382 +refs/heads/master: 80777c54d2a6ebeff783b638e92fba40f0881ba5 diff --git a/trunk/drivers/net/ethernet/neterion/s2io.c b/trunk/drivers/net/ethernet/neterion/s2io.c index 22a8de00bf02..eb2ab048cbca 100644 --- a/trunk/drivers/net/ethernet/neterion/s2io.c +++ b/trunk/drivers/net/ethernet/neterion/s2io.c @@ -2847,6 +2847,7 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget) static void s2io_netpoll(struct net_device *dev) { struct s2io_nic *nic = netdev_priv(dev); + const int irq = nic->pdev->irq; struct XENA_dev_config __iomem *bar0 = nic->bar0; u64 val64 = 0xFFFFFFFFFFFFFFFFULL; int i; @@ -2856,7 +2857,7 @@ static void s2io_netpoll(struct net_device *dev) if (pci_channel_offline(nic->pdev)) return; - disable_irq(dev->irq); + disable_irq(irq); writeq(val64, &bar0->rx_traffic_int); writeq(val64, &bar0->tx_traffic_int); @@ -2885,7 +2886,7 @@ static void s2io_netpoll(struct net_device *dev) break; } } - enable_irq(dev->irq); + enable_irq(irq); } #endif @@ -3898,9 +3899,7 @@ static void remove_msix_isr(struct s2io_nic *sp) static void remove_inta_isr(struct s2io_nic *sp) { - struct net_device *dev = sp->dev; - - free_irq(sp->pdev->irq, dev); + free_irq(sp->pdev->irq, sp->dev); } /* ********************************************************* * @@ -7047,7 +7046,7 @@ static int s2io_add_isr(struct s2io_nic *sp) } } if (sp->config.intr_type == INTA) { - err = request_irq((int)sp->pdev->irq, s2io_isr, IRQF_SHARED, + err = request_irq(sp->pdev->irq, s2io_isr, IRQF_SHARED, sp->name, dev); if (err) { DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n", @@ -7909,9 +7908,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) goto bar1_remap_failed; } - dev->irq = pdev->irq; - dev->base_addr = (unsigned long)sp->bar0; - /* Initializing the BAR1 address as the start of the FIFO pointer. */ for (j = 0; j < MAX_TX_FIFOS; j++) { mac_control->tx_FIFO_start[j] = sp->bar1 + (j * 0x00020000);