diff options
Diffstat (limited to 'drivers/net/sb1000.c')
-rw-r--r-- | drivers/net/sb1000.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 66cf226c4ee3..a1789ae59278 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | Small changes to make it work with 2.1.x kernels. Hopefully, | 29 | Small changes to make it work with 2.1.x kernels. Hopefully, |
30 | nothing major will change before official release of Linux 2.2. | 30 | nothing major will change before official release of Linux 2.2. |
31 | 31 | ||
32 | Merged with 2.2 - Alan Cox | 32 | Merged with 2.2 - Alan Cox |
33 | */ | 33 | */ |
34 | 34 | ||
@@ -143,7 +143,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id) | |||
143 | unsigned short ioaddr[2], irq; | 143 | unsigned short ioaddr[2], irq; |
144 | unsigned int serial_number; | 144 | unsigned int serial_number; |
145 | int error = -ENODEV; | 145 | int error = -ENODEV; |
146 | 146 | ||
147 | if (pnp_device_attach(pdev) < 0) | 147 | if (pnp_device_attach(pdev) < 0) |
148 | return -ENODEV; | 148 | return -ENODEV; |
149 | if (pnp_activate_dev(pdev) < 0) | 149 | if (pnp_activate_dev(pdev) < 0) |
@@ -153,12 +153,12 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id) | |||
153 | goto out_disable; | 153 | goto out_disable; |
154 | if (!pnp_irq_valid(pdev, 0)) | 154 | if (!pnp_irq_valid(pdev, 0)) |
155 | goto out_disable; | 155 | goto out_disable; |
156 | 156 | ||
157 | serial_number = pdev->card->serial; | 157 | serial_number = pdev->card->serial; |
158 | 158 | ||
159 | ioaddr[0] = pnp_port_start(pdev, 0); | 159 | ioaddr[0] = pnp_port_start(pdev, 0); |
160 | ioaddr[1] = pnp_port_start(pdev, 0); | 160 | ioaddr[1] = pnp_port_start(pdev, 0); |
161 | 161 | ||
162 | irq = pnp_irq(pdev, 0); | 162 | irq = pnp_irq(pdev, 0); |
163 | 163 | ||
164 | if (!request_region(ioaddr[0], 16, "sb1000")) | 164 | if (!request_region(ioaddr[0], 16, "sb1000")) |
@@ -172,7 +172,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id) | |||
172 | goto out_release_regions; | 172 | goto out_release_regions; |
173 | } | 173 | } |
174 | 174 | ||
175 | 175 | ||
176 | dev->base_addr = ioaddr[0]; | 176 | dev->base_addr = ioaddr[0]; |
177 | /* mem_start holds the second I/O address */ | 177 | /* mem_start holds the second I/O address */ |
178 | dev->mem_start = ioaddr[1]; | 178 | dev->mem_start = ioaddr[1]; |
@@ -246,7 +246,7 @@ static struct pnp_driver sb1000_driver = { | |||
246 | .remove = sb1000_remove_one, | 246 | .remove = sb1000_remove_one, |
247 | }; | 247 | }; |
248 | 248 | ||
249 | 249 | ||
250 | /* | 250 | /* |
251 | * SB1000 hardware routines to be used during open/configuration phases | 251 | * SB1000 hardware routines to be used during open/configuration phases |
252 | */ | 252 | */ |
@@ -351,7 +351,7 @@ card_send_command(const int ioaddr[], const char* name, | |||
351 | return 0; | 351 | return 0; |
352 | } | 352 | } |
353 | 353 | ||
354 | 354 | ||
355 | /* | 355 | /* |
356 | * SB1000 hardware routines to be used during frame rx interrupt | 356 | * SB1000 hardware routines to be used during frame rx interrupt |
357 | */ | 357 | */ |
@@ -449,7 +449,7 @@ sb1000_issue_read_command(const int ioaddr[], const char* name) | |||
449 | return; | 449 | return; |
450 | } | 450 | } |
451 | 451 | ||
452 | 452 | ||
453 | /* | 453 | /* |
454 | * SB1000 commands for open/configuration | 454 | * SB1000 commands for open/configuration |
455 | */ | 455 | */ |
@@ -697,7 +697,7 @@ sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[]) | |||
697 | return sb1000_end_get_set_command(ioaddr, name); | 697 | return sb1000_end_get_set_command(ioaddr, name); |
698 | } | 698 | } |
699 | 699 | ||
700 | 700 | ||
701 | static inline void | 701 | static inline void |
702 | sb1000_print_status_buffer(const char* name, unsigned char st[], | 702 | sb1000_print_status_buffer(const char* name, unsigned char st[], |
703 | unsigned char buffer[], int size) | 703 | unsigned char buffer[], int size) |
@@ -916,7 +916,7 @@ sb1000_error_dpc(struct net_device *dev) | |||
916 | return; | 916 | return; |
917 | } | 917 | } |
918 | 918 | ||
919 | 919 | ||
920 | /* | 920 | /* |
921 | * Linux interface functions | 921 | * Linux interface functions |
922 | */ | 922 | */ |
@@ -1155,7 +1155,7 @@ static int sb1000_close(struct net_device *dev) | |||
1155 | printk(KERN_DEBUG "%s: Shutting down sb1000.\n", dev->name); | 1155 | printk(KERN_DEBUG "%s: Shutting down sb1000.\n", dev->name); |
1156 | 1156 | ||
1157 | netif_stop_queue(dev); | 1157 | netif_stop_queue(dev); |
1158 | 1158 | ||
1159 | ioaddr[0] = dev->base_addr; | 1159 | ioaddr[0] = dev->base_addr; |
1160 | /* mem_start holds the second I/O address */ | 1160 | /* mem_start holds the second I/O address */ |
1161 | ioaddr[1] = dev->mem_start; | 1161 | ioaddr[1] = dev->mem_start; |