[PATCH] ppc32: 8xx: convert fec driver to use work_struct

8xx: convert fec driver to use work_struct

Signed-off-by: Aristeu Sergio Rozanski Filho <aris@conectiva.com.br>
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Aristeu Sergio Rozanski Filho and committed by Linus Torvalds 8b0ed2fb 68b47139

+9 -9
+9 -9
arch/ppc/8xx_io/fec.c
··· 173 173 uint phy_status; 174 174 uint phy_speed; 175 175 phy_info_t *phy; 176 - struct tq_struct phy_task; 176 + struct work_struct phy_task; 177 177 178 178 uint sequence_done; 179 179 ··· 1263 1263 printk(".\n"); 1264 1264 } 1265 1265 1266 - static void mii_display_config(struct net_device *dev) 1266 + static void mii_display_config(void *priv) 1267 1267 { 1268 + struct net_device *dev = (struct net_device *)priv; 1268 1269 struct fec_enet_private *fep = dev->priv; 1269 1270 volatile uint *s = &(fep->phy_status); 1270 1271 ··· 1295 1294 fep->sequence_done = 1; 1296 1295 } 1297 1296 1298 - static void mii_relink(struct net_device *dev) 1297 + static void mii_relink(void *priv) 1299 1298 { 1299 + struct net_device *dev = (struct net_device *)priv; 1300 1300 struct fec_enet_private *fep = dev->priv; 1301 1301 int duplex; 1302 1302 ··· 1325 1323 { 1326 1324 struct fec_enet_private *fep = dev->priv; 1327 1325 1328 - fep->phy_task.routine = (void *)mii_relink; 1329 - fep->phy_task.data = dev; 1330 - schedule_task(&fep->phy_task); 1326 + INIT_WORK(&fep->phy_task, mii_relink, (void *)dev); 1327 + schedule_work(&fep->phy_task); 1331 1328 } 1332 1329 1333 1330 static void mii_queue_config(uint mii_reg, struct net_device *dev) 1334 1331 { 1335 1332 struct fec_enet_private *fep = dev->priv; 1336 1333 1337 - fep->phy_task.routine = (void *)mii_display_config; 1338 - fep->phy_task.data = dev; 1339 - schedule_task(&fep->phy_task); 1334 + INIT_WORK(&fep->phy_task, mii_display_config, (void *)dev); 1335 + schedule_work(&fep->phy_task); 1340 1336 } 1341 1337 1342 1338