1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 19ab3441269c..e7737d02bb05 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2102,9 +2102,10 @@ static void e100_tx_timeout(struct net_device *netdev)
         schedule_work(&nic->tx_timeout_task);
 }
 
-static void e100_tx_timeout_task(struct net_device *netdev)
+static void e100_tx_timeout_task(struct work_struct *work)
 {
-        struct nic *nic = netdev_priv(netdev);
+        struct nic *nic = container_of(work, struct nic, tx_timeout_task);
+        struct net_device *netdev = nic->netdev;
 
         DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
                 readb(&nic->csr->scb.status));
@@ -2637,8 +2638,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
         nic->blink_timer.function = e100_blink_led;
         nic->blink_timer.data = (unsigned long)nic;
 
-        INIT_WORK(&nic->tx_timeout_task,
-                (void (*)(void *))e100_tx_timeout_task, netdev);
+        INIT_WORK(&nic->tx_timeout_task, e100_tx_timeout_task);
 
         if((err = e100_alloc(nic))) {
                 DPRINTK(PROBE, ERR, "Cannot alloc driver memory, aborting.\n");