diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-25 21:24:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 21:24:57 -0500 |
commit | 4be7ef4eac1d96a61af62bda8a59c1fb78c3b31b (patch) | |
tree | 931e4aedb7465128eff0d3d0ada3a342e0f642dd /drivers/net/hp.c | |
parent | 0ec4d4fe413f4d16fb35a326a2dcf912872abcc8 (diff) |
hp: convert to net_device_ops
Another old EISA driver converted.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hp.c')
-rw-r--r-- | drivers/net/hp.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c index 3669194f1063..5c4d78c1ff42 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c | |||
@@ -59,8 +59,6 @@ static unsigned int hppclan_portlist[] __initdata = | |||
59 | 59 | ||
60 | static int hp_probe1(struct net_device *dev, int ioaddr); | 60 | static int hp_probe1(struct net_device *dev, int ioaddr); |
61 | 61 | ||
62 | static int hp_open(struct net_device *dev); | ||
63 | static int hp_close(struct net_device *dev); | ||
64 | static void hp_reset_8390(struct net_device *dev); | 62 | static void hp_reset_8390(struct net_device *dev); |
65 | static void hp_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, | 63 | static void hp_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, |
66 | int ring_page); | 64 | int ring_page); |
@@ -198,11 +196,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
198 | 196 | ||
199 | /* Set the base address to point to the NIC, not the "real" base! */ | 197 | /* Set the base address to point to the NIC, not the "real" base! */ |
200 | dev->base_addr = ioaddr + NIC_OFFSET; | 198 | dev->base_addr = ioaddr + NIC_OFFSET; |
201 | dev->open = &hp_open; | 199 | dev->netdev_ops = &eip_netdev_ops; |
202 | dev->stop = &hp_close; | ||
203 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
204 | dev->poll_controller = eip_poll; | ||
205 | #endif | ||
206 | 200 | ||
207 | ei_status.name = name; | 201 | ei_status.name = name; |
208 | ei_status.word16 = wordmode; | 202 | ei_status.word16 = wordmode; |
@@ -227,20 +221,6 @@ out: | |||
227 | return retval; | 221 | return retval; |
228 | } | 222 | } |
229 | 223 | ||
230 | static int | ||
231 | hp_open(struct net_device *dev) | ||
232 | { | ||
233 | eip_open(dev); | ||
234 | return 0; | ||
235 | } | ||
236 | |||
237 | static int | ||
238 | hp_close(struct net_device *dev) | ||
239 | { | ||
240 | eip_close(dev); | ||
241 | return 0; | ||
242 | } | ||
243 | |||
244 | static void | 224 | static void |
245 | hp_reset_8390(struct net_device *dev) | 225 | hp_reset_8390(struct net_device *dev) |
246 | { | 226 | { |