1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 1ed9cccd3c11..3c33d6f6a6a6 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -168,8 +168,9 @@ struct baycom_state {
         int magic;
 
         struct pardevice *pdev;
+        struct net_device *dev;
         unsigned int work_running;
-        struct work_struct run_work;
+        struct delayed_work run_work;
         unsigned int modem;
         unsigned int bitrate;
         unsigned char stat;
@@ -659,16 +660,18 @@ static int receive(struct net_device *dev, int cnt)
 #define GETTICK(x)
 #endif /* __i386__ */
 
-static void epp_bh(struct net_device *dev)
+static void epp_bh(struct work_struct *work)
 {
+        struct net_device *dev;
         struct baycom_state *bc;
         struct parport *pp;
         unsigned char stat;
         unsigned char tmp[2];
         unsigned int time1 = 0, time2 = 0, time3 = 0;
         int cnt, cnt2;
-        
-        bc = netdev_priv(dev);
+
+        bc = container_of(work, struct baycom_state, run_work.work);
+        dev = bc->dev;
         if (!bc->work_running)
                 return;
         baycom_int_freq(bc);
@@ -889,7 +892,7 @@ static int epp_open(struct net_device *dev)
                 return -EBUSY;
         }
         dev->irq = /*pp->irq*/ 0;
-        INIT_WORK(&bc->run_work, (void *)(void *)epp_bh, dev);
+        INIT_DELAYED_WORK(&bc->run_work, epp_bh);
         bc->work_running = 1;
         bc->modem = EPP_CONVENTIONAL;
         if (eppconfig(bc))
@@ -1213,6 +1216,7 @@ static void __init baycom_epp_dev_setup(struct net_device *dev)
         /*
          * initialize part of the baycom_state struct
          */
+        bc->dev = dev;
         bc->magic = BAYCOM_MAGIC;
         bc->cfg.fclk = 19666600;
         bc->cfg.bps = 9600;