diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/cnic.c | 4 | ||||
-rw-r--r-- | drivers/net/jme.c | 10 | ||||
-rw-r--r-- | drivers/net/skge.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index e503384e2a54..ee7eb9ee77e2 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c | |||
@@ -3387,7 +3387,7 @@ static int cnic_init_bnx2_irq(struct cnic_dev *dev) | |||
3387 | 3387 | ||
3388 | cp->bnx2_status_blk = cp->status_blk; | 3388 | cp->bnx2_status_blk = cp->status_blk; |
3389 | cp->last_status_idx = cp->bnx2_status_blk->status_idx; | 3389 | cp->last_status_idx = cp->bnx2_status_blk->status_idx; |
3390 | tasklet_init(&cp->cnic_irq_task, &cnic_service_bnx2_msix, | 3390 | tasklet_init(&cp->cnic_irq_task, cnic_service_bnx2_msix, |
3391 | (unsigned long) dev); | 3391 | (unsigned long) dev); |
3392 | err = request_irq(ethdev->irq_arr[0].vector, cnic_irq, 0, | 3392 | err = request_irq(ethdev->irq_arr[0].vector, cnic_irq, 0, |
3393 | "cnic", dev); | 3393 | "cnic", dev); |
@@ -3787,7 +3787,7 @@ static int cnic_init_bnx2x_irq(struct cnic_dev *dev) | |||
3787 | struct cnic_eth_dev *ethdev = cp->ethdev; | 3787 | struct cnic_eth_dev *ethdev = cp->ethdev; |
3788 | int err = 0; | 3788 | int err = 0; |
3789 | 3789 | ||
3790 | tasklet_init(&cp->cnic_irq_task, &cnic_service_bnx2x_bh, | 3790 | tasklet_init(&cp->cnic_irq_task, cnic_service_bnx2x_bh, |
3791 | (unsigned long) dev); | 3791 | (unsigned long) dev); |
3792 | if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) { | 3792 | if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) { |
3793 | err = request_irq(ethdev->irq_arr[0].vector, cnic_irq, 0, | 3793 | err = request_irq(ethdev->irq_arr[0].vector, cnic_irq, 0, |
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 1d2a32544ed2..6c1b92fa0b0c 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
@@ -2764,19 +2764,19 @@ jme_init_one(struct pci_dev *pdev, | |||
2764 | atomic_set(&jme->rx_empty, 1); | 2764 | atomic_set(&jme->rx_empty, 1); |
2765 | 2765 | ||
2766 | tasklet_init(&jme->pcc_task, | 2766 | tasklet_init(&jme->pcc_task, |
2767 | &jme_pcc_tasklet, | 2767 | jme_pcc_tasklet, |
2768 | (unsigned long) jme); | 2768 | (unsigned long) jme); |
2769 | tasklet_init(&jme->linkch_task, | 2769 | tasklet_init(&jme->linkch_task, |
2770 | &jme_link_change_tasklet, | 2770 | jme_link_change_tasklet, |
2771 | (unsigned long) jme); | 2771 | (unsigned long) jme); |
2772 | tasklet_init(&jme->txclean_task, | 2772 | tasklet_init(&jme->txclean_task, |
2773 | &jme_tx_clean_tasklet, | 2773 | jme_tx_clean_tasklet, |
2774 | (unsigned long) jme); | 2774 | (unsigned long) jme); |
2775 | tasklet_init(&jme->rxclean_task, | 2775 | tasklet_init(&jme->rxclean_task, |
2776 | &jme_rx_clean_tasklet, | 2776 | jme_rx_clean_tasklet, |
2777 | (unsigned long) jme); | 2777 | (unsigned long) jme); |
2778 | tasklet_init(&jme->rxempty_task, | 2778 | tasklet_init(&jme->rxempty_task, |
2779 | &jme_rx_empty_tasklet, | 2779 | jme_rx_empty_tasklet, |
2780 | (unsigned long) jme); | 2780 | (unsigned long) jme); |
2781 | tasklet_disable_nosync(&jme->linkch_task); | 2781 | tasklet_disable_nosync(&jme->linkch_task); |
2782 | tasklet_disable_nosync(&jme->txclean_task); | 2782 | tasklet_disable_nosync(&jme->txclean_task); |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index ba5eb14094ef..34b4e7d500da 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -3947,7 +3947,7 @@ static int __devinit skge_probe(struct pci_dev *pdev, | |||
3947 | hw->pdev = pdev; | 3947 | hw->pdev = pdev; |
3948 | spin_lock_init(&hw->hw_lock); | 3948 | spin_lock_init(&hw->hw_lock); |
3949 | spin_lock_init(&hw->phy_lock); | 3949 | spin_lock_init(&hw->phy_lock); |
3950 | tasklet_init(&hw->phy_task, &skge_extirq, (unsigned long) hw); | 3950 | tasklet_init(&hw->phy_task, skge_extirq, (unsigned long) hw); |
3951 | 3951 | ||
3952 | hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); | 3952 | hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); |
3953 | if (!hw->regs) { | 3953 | if (!hw->regs) { |