WorkStruct: make allyesconfig

Fix up for make allyesconfig.

Signed-Off-By: David Howells <dhowells@redhat.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 66c57c1091a8..e801fff69dc0 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1458,7 +1458,7 @@ static void lane2_associate_ind(struct net_device *dev, u8 *mac_addr,
 
 #define LEC_ARP_REFRESH_INTERVAL (3*HZ)
 
-static void lec_arp_check_expire(void *data);
+static void lec_arp_check_expire(struct work_struct *work);
 static void lec_arp_expire_arp(unsigned long data);
 
 /* 
@@ -1481,7 +1481,7 @@ static void lec_arp_init(struct lec_priv *priv)
         INIT_HLIST_HEAD(&priv->lec_no_forward);
         INIT_HLIST_HEAD(&priv->mcast_fwds);
         spin_lock_init(&priv->lec_arp_lock);
-        INIT_WORK(&priv->lec_arp_work, lec_arp_check_expire, priv);
+        INIT_DELAYED_WORK(&priv->lec_arp_work, lec_arp_check_expire);
         schedule_delayed_work(&priv->lec_arp_work, LEC_ARP_REFRESH_INTERVAL);
 }
 
@@ -1879,10 +1879,11 @@ static void lec_arp_expire_vcc(unsigned long data)
  *       to ESI_FORWARD_DIRECT. This causes the flush period to end
  *       regardless of the progress of the flush protocol.
  */
-static void lec_arp_check_expire(void *data)
+static void lec_arp_check_expire(struct work_struct *work)
 {
         unsigned long flags;
-        struct lec_priv *priv = data;
+        struct lec_priv *priv =
+                container_of(work, struct lec_priv, lec_arp_work.work);
         struct hlist_node *node, *next;
         struct lec_arp_table *entry;
         unsigned long now;
diff --git a/net/atm/lec.h b/net/atm/lec.h
index 877f50939696..984e8e6e083a 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -92,7 +92,7 @@ struct lec_priv {
         spinlock_t lec_arp_lock;
         struct atm_vcc *mcast_vcc;              /* Default Multicast Send VCC */
         struct atm_vcc *lecd;
-        struct work_struct lec_arp_work;        /* C10 */
+        struct delayed_work lec_arp_work;       /* C10 */
         unsigned int maximum_unknown_frame_count;
                                                 /*
                                                  * Within the period of time defined by this variable, the client will send