diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-03-26 11:11:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-27 03:46:43 -0400 |
commit | 79f8ae3aa27f2f17a50ad1deee1e16ff02be01bb (patch) | |
tree | fe2c958bc84d06f00c2eb6b7df42e925bcdafa46 /drivers/net/tokenring/skisa.c | |
parent | ddec2c89f89b9f2d15ddff07f01570123e95f544 (diff) |
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>
Diffstat (limited to 'drivers/net/tokenring/skisa.c')
-rw-r--r-- | drivers/net/tokenring/skisa.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c index c0f58f08782c..46db5c5395b2 100644 --- a/drivers/net/tokenring/skisa.c +++ b/drivers/net/tokenring/skisa.c | |||
@@ -133,6 +133,8 @@ static int __init sk_isa_probe1(struct net_device *dev, int ioaddr) | |||
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
135 | 135 | ||
136 | static struct net_device_ops sk_isa_netdev_ops __read_mostly; | ||
137 | |||
136 | static int __init setup_card(struct net_device *dev, struct device *pdev) | 138 | static int __init setup_card(struct net_device *dev, struct device *pdev) |
137 | { | 139 | { |
138 | struct net_local *tp; | 140 | struct net_local *tp; |
@@ -184,8 +186,7 @@ static int __init setup_card(struct net_device *dev, struct device *pdev) | |||
184 | 186 | ||
185 | tp->tmspriv = NULL; | 187 | tp->tmspriv = NULL; |
186 | 188 | ||
187 | dev->open = sk_isa_open; | 189 | dev->netdev_ops = &sk_isa_netdev_ops; |
188 | dev->stop = tms380tr_close; | ||
189 | 190 | ||
190 | if (dev->irq == 0) | 191 | if (dev->irq == 0) |
191 | { | 192 | { |
@@ -362,6 +363,10 @@ static int __init sk_isa_init(void) | |||
362 | struct platform_device *pdev; | 363 | struct platform_device *pdev; |
363 | int i, num = 0, err = 0; | 364 | int i, num = 0, err = 0; |
364 | 365 | ||
366 | sk_isa_netdev_ops = tms380tr_netdev_ops; | ||
367 | sk_isa_netdev_ops.ndo_open = sk_isa_open; | ||
368 | sk_isa_netdev_ops.ndo_stop = tms380tr_close; | ||
369 | |||
365 | err = platform_driver_register(&sk_isa_driver); | 370 | err = platform_driver_register(&sk_isa_driver); |
366 | if (err) | 371 | if (err) |
367 | return err; | 372 | return err; |