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 | |
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')
-rw-r--r-- | drivers/net/tokenring/madgemc.c | 11 | ||||
-rw-r--r-- | drivers/net/tokenring/proteon.c | 9 | ||||
-rw-r--r-- | drivers/net/tokenring/skisa.c | 9 |
3 files changed, 20 insertions, 9 deletions
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 193308118f95..456f8bff40be 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
@@ -142,7 +142,7 @@ static void madgemc_sifwritew(struct net_device *dev, unsigned short val, unsign | |||
142 | return; | 142 | return; |
143 | } | 143 | } |
144 | 144 | ||
145 | 145 | static struct net_device_ops madgemc_netdev_ops __read_mostly; | |
146 | 146 | ||
147 | static int __devinit madgemc_probe(struct device *device) | 147 | static int __devinit madgemc_probe(struct device *device) |
148 | { | 148 | { |
@@ -168,7 +168,7 @@ static int __devinit madgemc_probe(struct device *device) | |||
168 | goto getout; | 168 | goto getout; |
169 | } | 169 | } |
170 | 170 | ||
171 | dev->dma = 0; | 171 | dev->netdev_ops = &madgemc_netdev_ops; |
172 | 172 | ||
173 | card = kmalloc(sizeof(struct card_info), GFP_KERNEL); | 173 | card = kmalloc(sizeof(struct card_info), GFP_KERNEL); |
174 | if (card==NULL) { | 174 | if (card==NULL) { |
@@ -348,9 +348,6 @@ static int __devinit madgemc_probe(struct device *device) | |||
348 | 348 | ||
349 | memcpy(tp->ProductID, "Madge MCA 16/4 ", PROD_ID_SIZE + 1); | 349 | memcpy(tp->ProductID, "Madge MCA 16/4 ", PROD_ID_SIZE + 1); |
350 | 350 | ||
351 | dev->open = madgemc_open; | ||
352 | dev->stop = madgemc_close; | ||
353 | |||
354 | tp->tmspriv = card; | 351 | tp->tmspriv = card; |
355 | dev_set_drvdata(device, dev); | 352 | dev_set_drvdata(device, dev); |
356 | 353 | ||
@@ -758,6 +755,10 @@ static struct mca_driver madgemc_driver = { | |||
758 | 755 | ||
759 | static int __init madgemc_init (void) | 756 | static int __init madgemc_init (void) |
760 | { | 757 | { |
758 | madgemc_netdev_ops = tms380tr_netdev_ops; | ||
759 | madgemc_netdev_ops.ndo_open = madgemc_open; | ||
760 | madgemc_netdev_ops.ndo_stop = madgemc_close; | ||
761 | |||
761 | return mca_register_driver (&madgemc_driver); | 762 | return mca_register_driver (&madgemc_driver); |
762 | } | 763 | } |
763 | 764 | ||
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c index b8c955f6d31a..16e8783ee9cd 100644 --- a/drivers/net/tokenring/proteon.c +++ b/drivers/net/tokenring/proteon.c | |||
@@ -116,6 +116,8 @@ nodev: | |||
116 | return -ENODEV; | 116 | return -ENODEV; |
117 | } | 117 | } |
118 | 118 | ||
119 | static struct net_device_ops proteon_netdev_ops __read_mostly; | ||
120 | |||
119 | static int __init setup_card(struct net_device *dev, struct device *pdev) | 121 | static int __init setup_card(struct net_device *dev, struct device *pdev) |
120 | { | 122 | { |
121 | struct net_local *tp; | 123 | struct net_local *tp; |
@@ -167,8 +169,7 @@ static int __init setup_card(struct net_device *dev, struct device *pdev) | |||
167 | 169 | ||
168 | tp->tmspriv = NULL; | 170 | tp->tmspriv = NULL; |
169 | 171 | ||
170 | dev->open = proteon_open; | 172 | dev->netdev_ops = &proteon_netdev_ops; |
171 | dev->stop = tms380tr_close; | ||
172 | 173 | ||
173 | if (dev->irq == 0) | 174 | if (dev->irq == 0) |
174 | { | 175 | { |
@@ -352,6 +353,10 @@ static int __init proteon_init(void) | |||
352 | struct platform_device *pdev; | 353 | struct platform_device *pdev; |
353 | int i, num = 0, err = 0; | 354 | int i, num = 0, err = 0; |
354 | 355 | ||
356 | proteon_netdev_ops = tms380tr_netdev_ops; | ||
357 | proteon_netdev_ops.ndo_open = proteon_open; | ||
358 | proteon_netdev_ops.ndo_stop = tms380tr_close; | ||
359 | |||
355 | err = platform_driver_register(&proteon_driver); | 360 | err = platform_driver_register(&proteon_driver); |
356 | if (err) | 361 | if (err) |
357 | return err; | 362 | return err; |
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; |