diff options
Diffstat (limited to 'drivers/net/ethernet/8390/hydra.c')
-rw-r--r-- | drivers/net/ethernet/8390/hydra.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c index 5370c884620b..bc81de1b7d4f 100644 --- a/drivers/net/ethernet/8390/hydra.c +++ b/drivers/net/ethernet/8390/hydra.c | |||
@@ -53,9 +53,9 @@ static const char version[] = | |||
53 | #define WORDSWAP(a) ((((a)>>8)&0xff) | ((a)<<8)) | 53 | #define WORDSWAP(a) ((((a)>>8)&0xff) | ((a)<<8)) |
54 | 54 | ||
55 | 55 | ||
56 | static int __devinit hydra_init_one(struct zorro_dev *z, | 56 | static int hydra_init_one(struct zorro_dev *z, |
57 | const struct zorro_device_id *ent); | 57 | const struct zorro_device_id *ent); |
58 | static int __devinit hydra_init(struct zorro_dev *z); | 58 | static int hydra_init(struct zorro_dev *z); |
59 | static int hydra_open(struct net_device *dev); | 59 | static int hydra_open(struct net_device *dev); |
60 | static int hydra_close(struct net_device *dev); | 60 | static int hydra_close(struct net_device *dev); |
61 | static void hydra_reset_8390(struct net_device *dev); | 61 | static void hydra_reset_8390(struct net_device *dev); |
@@ -65,9 +65,9 @@ static void hydra_block_input(struct net_device *dev, int count, | |||
65 | struct sk_buff *skb, int ring_offset); | 65 | struct sk_buff *skb, int ring_offset); |
66 | static void hydra_block_output(struct net_device *dev, int count, | 66 | static void hydra_block_output(struct net_device *dev, int count, |
67 | const unsigned char *buf, int start_page); | 67 | const unsigned char *buf, int start_page); |
68 | static void __devexit hydra_remove_one(struct zorro_dev *z); | 68 | static void hydra_remove_one(struct zorro_dev *z); |
69 | 69 | ||
70 | static struct zorro_device_id hydra_zorro_tbl[] __devinitdata = { | 70 | static struct zorro_device_id hydra_zorro_tbl[] = { |
71 | { ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET }, | 71 | { ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET }, |
72 | { 0 } | 72 | { 0 } |
73 | }; | 73 | }; |
@@ -77,10 +77,10 @@ static struct zorro_driver hydra_driver = { | |||
77 | .name = "hydra", | 77 | .name = "hydra", |
78 | .id_table = hydra_zorro_tbl, | 78 | .id_table = hydra_zorro_tbl, |
79 | .probe = hydra_init_one, | 79 | .probe = hydra_init_one, |
80 | .remove = __devexit_p(hydra_remove_one), | 80 | .remove = hydra_remove_one, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static int __devinit hydra_init_one(struct zorro_dev *z, | 83 | static int hydra_init_one(struct zorro_dev *z, |
84 | const struct zorro_device_id *ent) | 84 | const struct zorro_device_id *ent) |
85 | { | 85 | { |
86 | int err; | 86 | int err; |
@@ -110,7 +110,7 @@ static const struct net_device_ops hydra_netdev_ops = { | |||
110 | #endif | 110 | #endif |
111 | }; | 111 | }; |
112 | 112 | ||
113 | static int __devinit hydra_init(struct zorro_dev *z) | 113 | static int hydra_init(struct zorro_dev *z) |
114 | { | 114 | { |
115 | struct net_device *dev; | 115 | struct net_device *dev; |
116 | unsigned long board = ZTWO_VADDR(z->resource.start); | 116 | unsigned long board = ZTWO_VADDR(z->resource.start); |
@@ -247,7 +247,7 @@ static void hydra_block_output(struct net_device *dev, int count, | |||
247 | z_memcpy_toio(mem_base+((start_page - NESM_START_PG)<<8), buf, count); | 247 | z_memcpy_toio(mem_base+((start_page - NESM_START_PG)<<8), buf, count); |
248 | } | 248 | } |
249 | 249 | ||
250 | static void __devexit hydra_remove_one(struct zorro_dev *z) | 250 | static void hydra_remove_one(struct zorro_dev *z) |
251 | { | 251 | { |
252 | struct net_device *dev = zorro_get_drvdata(z); | 252 | struct net_device *dev = zorro_get_drvdata(z); |
253 | 253 | ||