diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-11-05 11:42:27 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2005-11-05 21:00:03 -0500 |
commit | d38087609aefdf0918960c9d941d46f884a4f4eb (patch) | |
tree | fed1c0c9cbd81f1f3068e5b9bd979040ec74e68a /drivers | |
parent | 05d0f1cf69fd589634b38b6f6e4b8cfdaace9ca0 (diff) |
[PATCH] airo.c/airo_cs.c: correct prototypes
This patch creates a file airo.h containing prototypes of the global
functions in airo.c used by airo_cs.c .
If you got strange problems with either airo_cs devices or in any other
completely unrelated part of the kernel shortly or long after a airo_cs
device was detected by the kernel, this might have been caused by the
fact that caller and callee disagreed regarding the size of the first
argument to init_airo_card()...
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/airo.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/airo.h | 9 | ||||
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 849ac88bcccc..6afc6e5dee9b 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -47,6 +47,8 @@ | |||
47 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |
48 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
49 | 49 | ||
50 | #include "airo.h" | ||
51 | |||
50 | #ifdef CONFIG_PCI | 52 | #ifdef CONFIG_PCI |
51 | static struct pci_device_id card_ids[] = { | 53 | static struct pci_device_id card_ids[] = { |
52 | { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, | 54 | { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, |
diff --git a/drivers/net/wireless/airo.h b/drivers/net/wireless/airo.h new file mode 100644 index 000000000000..e480adf86be6 --- /dev/null +++ b/drivers/net/wireless/airo.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #ifndef _AIRO_H_ | ||
2 | #define _AIRO_H_ | ||
3 | |||
4 | struct net_device *init_airo_card(unsigned short irq, int port, int is_pcmcia, | ||
5 | struct device *dmdev); | ||
6 | int reset_airo_card(struct net_device *dev); | ||
7 | void stop_airo_card(struct net_device *dev, int freeres); | ||
8 | |||
9 | #endif /* _AIRO_H_ */ | ||
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 784de9109113..96ed8da8661d 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -42,6 +42,8 @@ | |||
42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
44 | 44 | ||
45 | #include "airo.h" | ||
46 | |||
45 | /* | 47 | /* |
46 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If | 48 | All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If |
47 | you do not define PCMCIA_DEBUG at all, all the debug code will be | 49 | you do not define PCMCIA_DEBUG at all, all the debug code will be |
@@ -78,10 +80,6 @@ MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards"); | |||
78 | event handler. | 80 | event handler. |
79 | */ | 81 | */ |
80 | 82 | ||
81 | struct net_device *init_airo_card( int, int, int, struct device * ); | ||
82 | void stop_airo_card( struct net_device *, int ); | ||
83 | int reset_airo_card( struct net_device * ); | ||
84 | |||
85 | static void airo_config(dev_link_t *link); | 83 | static void airo_config(dev_link_t *link); |
86 | static void airo_release(dev_link_t *link); | 84 | static void airo_release(dev_link_t *link); |
87 | static int airo_event(event_t event, int priority, | 85 | static int airo_event(event_t event, int priority, |