Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tokenring: convert drivers to net_device_ops

Convert madge and proteon drivers which are really just subclasses
of tms380.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller
79f8ae3a ddec2c89

+20 -9
+6 -5
drivers/net/tokenring/madgemc.c
··· 142 142 return; 143 143 } 144 144 145 - 145 + static struct net_device_ops madgemc_netdev_ops __read_mostly; 146 146 147 147 static int __devinit madgemc_probe(struct device *device) 148 148 { ··· 168 168 goto getout; 169 169 } 170 170 171 - dev->dma = 0; 171 + dev->netdev_ops = &madgemc_netdev_ops; 172 172 173 173 card = kmalloc(sizeof(struct card_info), GFP_KERNEL); 174 174 if (card==NULL) { ··· 347 347 tp->DataRate = (card->ringspeed)?SPEED_16:SPEED_4; 348 348 349 349 memcpy(tp->ProductID, "Madge MCA 16/4 ", PROD_ID_SIZE + 1); 350 - 351 - dev->open = madgemc_open; 352 - dev->stop = madgemc_close; 353 350 354 351 tp->tmspriv = card; 355 352 dev_set_drvdata(device, dev); ··· 755 758 756 759 static int __init madgemc_init (void) 757 760 { 761 + madgemc_netdev_ops = tms380tr_netdev_ops; 762 + madgemc_netdev_ops.ndo_open = madgemc_open; 763 + madgemc_netdev_ops.ndo_stop = madgemc_close; 764 + 758 765 return mca_register_driver (&madgemc_driver); 759 766 } 760 767
+7 -2
drivers/net/tokenring/proteon.c
··· 116 116 return -ENODEV; 117 117 } 118 118 119 + static struct net_device_ops proteon_netdev_ops __read_mostly; 120 + 119 121 static int __init setup_card(struct net_device *dev, struct device *pdev) 120 122 { 121 123 struct net_local *tp; ··· 169 167 170 168 tp->tmspriv = NULL; 171 169 172 - dev->open = proteon_open; 173 - dev->stop = tms380tr_close; 170 + dev->netdev_ops = &proteon_netdev_ops; 174 171 175 172 if (dev->irq == 0) 176 173 { ··· 352 351 struct net_device *dev; 353 352 struct platform_device *pdev; 354 353 int i, num = 0, err = 0; 354 + 355 + proteon_netdev_ops = tms380tr_netdev_ops; 356 + proteon_netdev_ops.ndo_open = proteon_open; 357 + proteon_netdev_ops.ndo_stop = tms380tr_close; 355 358 356 359 err = platform_driver_register(&proteon_driver); 357 360 if (err)
+7 -2
drivers/net/tokenring/skisa.c
··· 133 133 return 0; 134 134 } 135 135 136 + static struct net_device_ops sk_isa_netdev_ops __read_mostly; 137 + 136 138 static int __init setup_card(struct net_device *dev, struct device *pdev) 137 139 { 138 140 struct net_local *tp; ··· 186 184 187 185 tp->tmspriv = NULL; 188 186 189 - dev->open = sk_isa_open; 190 - dev->stop = tms380tr_close; 187 + dev->netdev_ops = &sk_isa_netdev_ops; 191 188 192 189 if (dev->irq == 0) 193 190 { ··· 362 361 struct net_device *dev; 363 362 struct platform_device *pdev; 364 363 int i, num = 0, err = 0; 364 + 365 + sk_isa_netdev_ops = tms380tr_netdev_ops; 366 + sk_isa_netdev_ops.ndo_open = sk_isa_open; 367 + sk_isa_netdev_ops.ndo_stop = tms380tr_close; 365 368 366 369 err = platform_driver_register(&sk_isa_driver); 367 370 if (err)