diff options
Diffstat (limited to 'drivers/net/hplance.c')
-rw-r--r-- | drivers/net/hplance.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index 685693464605..9c643f2a8d54 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c | |||
@@ -45,12 +45,12 @@ struct hplance_private { | |||
45 | 45 | ||
46 | /* function prototypes... This is easy because all the grot is in the | 46 | /* function prototypes... This is easy because all the grot is in the |
47 | * generic LANCE support. All we have to support is probing for boards, | 47 | * generic LANCE support. All we have to support is probing for boards, |
48 | * plus board-specific init, open and close actions. | 48 | * plus board-specific init, open and close actions. |
49 | * Oh, and we need to tell the generic code how to read and write LANCE registers... | 49 | * Oh, and we need to tell the generic code how to read and write LANCE registers... |
50 | */ | 50 | */ |
51 | static int __devinit hplance_init_one(struct dio_dev *d, | 51 | static int __devinit hplance_init_one(struct dio_dev *d, |
52 | const struct dio_device_id *ent); | 52 | const struct dio_device_id *ent); |
53 | static void __devinit hplance_init(struct net_device *dev, | 53 | static void __devinit hplance_init(struct net_device *dev, |
54 | struct dio_dev *d); | 54 | struct dio_dev *d); |
55 | static void __devexit hplance_remove_one(struct dio_dev *d); | 55 | static void __devexit hplance_remove_one(struct dio_dev *d); |
56 | static void hplance_writerap(void *priv, unsigned short value); | 56 | static void hplance_writerap(void *priv, unsigned short value); |
@@ -118,7 +118,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) | |||
118 | unsigned long va = (d->resource.start + DIO_VIRADDRBASE); | 118 | unsigned long va = (d->resource.start + DIO_VIRADDRBASE); |
119 | struct hplance_private *lp; | 119 | struct hplance_private *lp; |
120 | int i; | 120 | int i; |
121 | 121 | ||
122 | printk(KERN_INFO "%s: %s; select code %d, addr", dev->name, d->name, d->scode); | 122 | printk(KERN_INFO "%s: %s; select code %d, addr", dev->name, d->name, d->scode); |
123 | 123 | ||
124 | /* reset the board */ | 124 | /* reset the board */ |
@@ -136,7 +136,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) | |||
136 | dev->get_stats = &lance_get_stats; | 136 | dev->get_stats = &lance_get_stats; |
137 | dev->set_multicast_list = &lance_set_multicast; | 137 | dev->set_multicast_list = &lance_set_multicast; |
138 | dev->dma = 0; | 138 | dev->dma = 0; |
139 | 139 | ||
140 | for (i=0; i<6; i++) { | 140 | for (i=0; i<6; i++) { |
141 | /* The NVRAM holds our ethernet address, one nibble per byte, | 141 | /* The NVRAM holds our ethernet address, one nibble per byte, |
142 | * at bytes NVRAMOFF+1,3,5,7,9... | 142 | * at bytes NVRAMOFF+1,3,5,7,9... |
@@ -145,7 +145,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) | |||
145 | | (in_8(va + HPLANCE_NVRAMOFF + i*4 + 3) & 0xF); | 145 | | (in_8(va + HPLANCE_NVRAMOFF + i*4 + 3) & 0xF); |
146 | printk("%c%2.2x", i == 0 ? ' ' : ':', dev->dev_addr[i]); | 146 | printk("%c%2.2x", i == 0 ? ' ' : ':', dev->dev_addr[i]); |
147 | } | 147 | } |
148 | 148 | ||
149 | lp = netdev_priv(dev); | 149 | lp = netdev_priv(dev); |
150 | lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ | 150 | lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ |
151 | lp->lance.base = va; | 151 | lp->lance.base = va; |
@@ -196,7 +196,7 @@ static int hplance_open(struct net_device *dev) | |||
196 | { | 196 | { |
197 | int status; | 197 | int status; |
198 | struct lance_private *lp = netdev_priv(dev); | 198 | struct lance_private *lp = netdev_priv(dev); |
199 | 199 | ||
200 | status = lance_open(dev); /* call generic lance open code */ | 200 | status = lance_open(dev); /* call generic lance open code */ |
201 | if (status) | 201 | if (status) |
202 | return status; | 202 | return status; |