diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-01 03:16:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-01 03:16:17 +0000 |
| commit | d8d9b8f76f22b7a16a83e261e64f89ee611f49df (patch) | |
| tree | 3067bc130b80d52808e6390c9fc7fc087ec1e33c /drivers/net/sonic.c | |
| parent | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (diff) | |
Initial revision
Diffstat (limited to 'drivers/net/sonic.c')
| -rw-r--r-- | drivers/net/sonic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c index dfa5b272c..c42450a44 100644 --- a/drivers/net/sonic.c +++ b/drivers/net/sonic.c @@ -28,6 +28,7 @@ static const char *version = #include <linux/fcntl.h> #include <linux/interrupt.h> #include <linux/ptrace.h> +#include <linux/init.h> #include <linux/ioport.h> #include <linux/in.h> #include <linux/malloc.h> @@ -127,7 +128,7 @@ static int sonic_init(struct device *dev); * Probe for a SONIC ethernet controller on a Mips Jazz board. * Actually probing is superfluous but we're paranoid. */ -int sonic_probe(struct device *dev) +__initfunc(int sonic_probe(struct device *dev)) { unsigned int base_addr = dev ? dev->base_addr : 0; int i; @@ -152,8 +153,8 @@ int sonic_probe(struct device *dev) return -ENODEV; } -static int -sonic_probe1(struct device *dev, unsigned int base_addr, unsigned int irq) +__initfunc(static int sonic_probe1(struct device *dev, + unsigned int base_addr, unsigned int irq)) { static unsigned version_printed = 0; unsigned int silicon_revision; @@ -403,7 +404,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct device *dev) * Block a timer-based transmit from overlapping. This could better be * done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */ - if (set_bit(0, (void*)&dev->tbusy) != 0) { + if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) { printk("%s: Transmitter access conflict.\n", dev->name); return 1; } @@ -719,8 +720,7 @@ sonic_multicast_list(struct device *dev) /* * Initialize the SONIC ethernet controller. */ -static int -sonic_init(struct device *dev) +static int sonic_init(struct device *dev) { unsigned int base_addr = dev->base_addr; unsigned int cmd; |