aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/sb1000.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sb1000.c')
-rw-r--r--drivers/net/sb1000.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 66cf226c4ee..a1789ae5927 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -28,7 +28,7 @@
Small changes to make it work with 2.1.x kernels. Hopefully,
nothing major will change before official release of Linux 2.2.
-
+
Merged with 2.2 - Alan Cox
*/
@@ -143,7 +143,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
unsigned short ioaddr[2], irq;
unsigned int serial_number;
int error = -ENODEV;
-
+
if (pnp_device_attach(pdev) < 0)
return -ENODEV;
if (pnp_activate_dev(pdev) < 0)
@@ -153,12 +153,12 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
goto out_disable;
if (!pnp_irq_valid(pdev, 0))
goto out_disable;
-
+
serial_number = pdev->card->serial;
-
+
ioaddr[0] = pnp_port_start(pdev, 0);
ioaddr[1] = pnp_port_start(pdev, 0);
-
+
irq = pnp_irq(pdev, 0);
if (!request_region(ioaddr[0], 16, "sb1000"))
@@ -172,7 +172,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
goto out_release_regions;
}
-
+
dev->base_addr = ioaddr[0];
/* mem_start holds the second I/O address */
dev->mem_start = ioaddr[1];
@@ -246,7 +246,7 @@ static struct pnp_driver sb1000_driver = {
.remove = sb1000_remove_one,
};
-
+
/*
* SB1000 hardware routines to be used during open/configuration phases
*/
@@ -351,7 +351,7 @@ card_send_command(const int ioaddr[], const char* name,
return 0;
}
-
+
/*
* SB1000 hardware routines to be used during frame rx interrupt
*/
@@ -449,7 +449,7 @@ sb1000_issue_read_command(const int ioaddr[], const char* name)
return;
}
-
+
/*
* SB1000 commands for open/configuration
*/
@@ -697,7 +697,7 @@ sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[])
return sb1000_end_get_set_command(ioaddr, name);
}
-
+
static inline void
sb1000_print_status_buffer(const char* name, unsigned char st[],
unsigned char buffer[], int size)
@@ -916,7 +916,7 @@ sb1000_error_dpc(struct net_device *dev)
return;
}
-
+
/*
* Linux interface functions
*/
@@ -1155,7 +1155,7 @@ static int sb1000_close(struct net_device *dev)
printk(KERN_DEBUG "%s: Shutting down sb1000.\n", dev->name);
netif_stop_queue(dev);
-
+
ioaddr[0] = dev->base_addr;
/* mem_start holds the second I/O address */
ioaddr[1] = dev->mem_start;