diff options
author | Arjan van de Ven <arjan@infradead.org> | 2006-01-14 16:20:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:06 -0500 |
commit | 858119e159384308a5dde67776691a2ebf70df0f (patch) | |
tree | f360768f999d51edc0863917ce0bf79e88c0ec4c /drivers/net/wireless/wavelan.c | |
parent | b0a9499c3dd50d333e2aedb7e894873c58da3785 (diff) |
[PATCH] Unlinline a bunch of other functions
Remove the "inline" keyword from a bunch of big functions in the kernel with
the goal of shrinking it by 30kb to 40kb
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/wireless/wavelan.c')
-rw-r--r-- | drivers/net/wireless/wavelan.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index b0d8b5b03152..ff192e96268a 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c | |||
@@ -102,7 +102,7 @@ static inline void hacr_write(unsigned long ioaddr, u16 hacr) | |||
102 | * Write to card's Host Adapter Command Register. Include a delay for | 102 | * Write to card's Host Adapter Command Register. Include a delay for |
103 | * those times when it is needed. | 103 | * those times when it is needed. |
104 | */ | 104 | */ |
105 | static inline void hacr_write_slow(unsigned long ioaddr, u16 hacr) | 105 | static void hacr_write_slow(unsigned long ioaddr, u16 hacr) |
106 | { | 106 | { |
107 | hacr_write(ioaddr, hacr); | 107 | hacr_write(ioaddr, hacr); |
108 | /* delay might only be needed sometimes */ | 108 | /* delay might only be needed sometimes */ |
@@ -242,7 +242,7 @@ static void psa_write(unsigned long ioaddr, u16 hacr, int o, /* Offset in PSA */ | |||
242 | * The Windows drivers don't use the CRC, but the AP and the PtP tool | 242 | * The Windows drivers don't use the CRC, but the AP and the PtP tool |
243 | * depend on it. | 243 | * depend on it. |
244 | */ | 244 | */ |
245 | static inline u16 psa_crc(u8 * psa, /* The PSA */ | 245 | static u16 psa_crc(u8 * psa, /* The PSA */ |
246 | int size) | 246 | int size) |
247 | { /* Number of short for CRC */ | 247 | { /* Number of short for CRC */ |
248 | int byte_cnt; /* Loop on the PSA */ | 248 | int byte_cnt; /* Loop on the PSA */ |
@@ -310,7 +310,7 @@ static void update_psa_checksum(struct net_device * dev, unsigned long ioaddr, u | |||
310 | /* | 310 | /* |
311 | * Write 1 byte to the MMC. | 311 | * Write 1 byte to the MMC. |
312 | */ | 312 | */ |
313 | static inline void mmc_out(unsigned long ioaddr, u16 o, u8 d) | 313 | static void mmc_out(unsigned long ioaddr, u16 o, u8 d) |
314 | { | 314 | { |
315 | int count = 0; | 315 | int count = 0; |
316 | 316 | ||
@@ -326,7 +326,7 @@ static inline void mmc_out(unsigned long ioaddr, u16 o, u8 d) | |||
326 | * Routine to write bytes to the Modem Management Controller. | 326 | * Routine to write bytes to the Modem Management Controller. |
327 | * We start at the end because it is the way it should be! | 327 | * We start at the end because it is the way it should be! |
328 | */ | 328 | */ |
329 | static inline void mmc_write(unsigned long ioaddr, u8 o, u8 * b, int n) | 329 | static void mmc_write(unsigned long ioaddr, u8 o, u8 * b, int n) |
330 | { | 330 | { |
331 | o += n; | 331 | o += n; |
332 | b += n; | 332 | b += n; |
@@ -340,7 +340,7 @@ static inline void mmc_write(unsigned long ioaddr, u8 o, u8 * b, int n) | |||
340 | * Read a byte from the MMC. | 340 | * Read a byte from the MMC. |
341 | * Optimised version for 1 byte, avoid using memory. | 341 | * Optimised version for 1 byte, avoid using memory. |
342 | */ | 342 | */ |
343 | static inline u8 mmc_in(unsigned long ioaddr, u16 o) | 343 | static u8 mmc_in(unsigned long ioaddr, u16 o) |
344 | { | 344 | { |
345 | int count = 0; | 345 | int count = 0; |
346 | 346 | ||
@@ -587,7 +587,7 @@ static void wv_ack(struct net_device * dev) | |||
587 | * Set channel attention bit and busy wait until command has | 587 | * Set channel attention bit and busy wait until command has |
588 | * completed, then acknowledge completion of the command. | 588 | * completed, then acknowledge completion of the command. |
589 | */ | 589 | */ |
590 | static inline int wv_synchronous_cmd(struct net_device * dev, const char *str) | 590 | static int wv_synchronous_cmd(struct net_device * dev, const char *str) |
591 | { | 591 | { |
592 | net_local *lp = (net_local *) dev->priv; | 592 | net_local *lp = (net_local *) dev->priv; |
593 | unsigned long ioaddr = dev->base_addr; | 593 | unsigned long ioaddr = dev->base_addr; |
@@ -633,7 +633,7 @@ static inline int wv_synchronous_cmd(struct net_device * dev, const char *str) | |||
633 | * Configuration commands completion interrupt. | 633 | * Configuration commands completion interrupt. |
634 | * Check if done, and if OK. | 634 | * Check if done, and if OK. |
635 | */ | 635 | */ |
636 | static inline int | 636 | static int |
637 | wv_config_complete(struct net_device * dev, unsigned long ioaddr, net_local * lp) | 637 | wv_config_complete(struct net_device * dev, unsigned long ioaddr, net_local * lp) |
638 | { | 638 | { |
639 | unsigned short mcs_addr; | 639 | unsigned short mcs_addr; |
@@ -843,7 +843,7 @@ if (lp->tx_n_in_use > 0) | |||
843 | * wavelan_interrupt is not an option), so you may experience | 843 | * wavelan_interrupt is not an option), so you may experience |
844 | * delays sometimes. | 844 | * delays sometimes. |
845 | */ | 845 | */ |
846 | static inline void wv_82586_reconfig(struct net_device * dev) | 846 | static void wv_82586_reconfig(struct net_device * dev) |
847 | { | 847 | { |
848 | net_local *lp = (net_local *) dev->priv; | 848 | net_local *lp = (net_local *) dev->priv; |
849 | unsigned long flags; | 849 | unsigned long flags; |
@@ -1281,7 +1281,7 @@ static inline void wv_packet_info(u8 * p, /* Packet to dump */ | |||
1281 | * This is the information which is displayed by the driver at startup. | 1281 | * This is the information which is displayed by the driver at startup. |
1282 | * There are lots of flags for configuring it to your liking. | 1282 | * There are lots of flags for configuring it to your liking. |
1283 | */ | 1283 | */ |
1284 | static inline void wv_init_info(struct net_device * dev) | 1284 | static void wv_init_info(struct net_device * dev) |
1285 | { | 1285 | { |
1286 | short ioaddr = dev->base_addr; | 1286 | short ioaddr = dev->base_addr; |
1287 | net_local *lp = (net_local *) dev->priv; | 1287 | net_local *lp = (net_local *) dev->priv; |
@@ -1502,7 +1502,7 @@ static int wavelan_set_mac_address(struct net_device * dev, void *addr) | |||
1502 | * It's a bit complicated and you don't really want to look into it. | 1502 | * It's a bit complicated and you don't really want to look into it. |
1503 | * (called in wavelan_ioctl) | 1503 | * (called in wavelan_ioctl) |
1504 | */ | 1504 | */ |
1505 | static inline int wv_set_frequency(unsigned long ioaddr, /* I/O port of the card */ | 1505 | static int wv_set_frequency(unsigned long ioaddr, /* I/O port of the card */ |
1506 | iw_freq * frequency) | 1506 | iw_freq * frequency) |
1507 | { | 1507 | { |
1508 | const int BAND_NUM = 10; /* Number of bands */ | 1508 | const int BAND_NUM = 10; /* Number of bands */ |
@@ -1677,7 +1677,7 @@ static inline int wv_set_frequency(unsigned long ioaddr, /* I/O port of the card | |||
1677 | /* | 1677 | /* |
1678 | * Give the list of available frequencies. | 1678 | * Give the list of available frequencies. |
1679 | */ | 1679 | */ |
1680 | static inline int wv_frequency_list(unsigned long ioaddr, /* I/O port of the card */ | 1680 | static int wv_frequency_list(unsigned long ioaddr, /* I/O port of the card */ |
1681 | iw_freq * list, /* List of frequencies to fill */ | 1681 | iw_freq * list, /* List of frequencies to fill */ |
1682 | int max) | 1682 | int max) |
1683 | { /* Maximum number of frequencies */ | 1683 | { /* Maximum number of frequencies */ |
@@ -2489,7 +2489,7 @@ static iw_stats *wavelan_get_wireless_stats(struct net_device * dev) | |||
2489 | * Note: if any errors occur, the packet is "dropped on the floor". | 2489 | * Note: if any errors occur, the packet is "dropped on the floor". |
2490 | * (called by wv_packet_rcv()) | 2490 | * (called by wv_packet_rcv()) |
2491 | */ | 2491 | */ |
2492 | static inline void | 2492 | static void |
2493 | wv_packet_read(struct net_device * dev, u16 buf_off, int sksize) | 2493 | wv_packet_read(struct net_device * dev, u16 buf_off, int sksize) |
2494 | { | 2494 | { |
2495 | net_local *lp = (net_local *) dev->priv; | 2495 | net_local *lp = (net_local *) dev->priv; |
@@ -2585,7 +2585,7 @@ wv_packet_read(struct net_device * dev, u16 buf_off, int sksize) | |||
2585 | * (called in wavelan_interrupt()). | 2585 | * (called in wavelan_interrupt()). |
2586 | * Note : the spinlock is already grabbed for us. | 2586 | * Note : the spinlock is already grabbed for us. |
2587 | */ | 2587 | */ |
2588 | static inline void wv_receive(struct net_device * dev) | 2588 | static void wv_receive(struct net_device * dev) |
2589 | { | 2589 | { |
2590 | unsigned long ioaddr = dev->base_addr; | 2590 | unsigned long ioaddr = dev->base_addr; |
2591 | net_local *lp = (net_local *) dev->priv; | 2591 | net_local *lp = (net_local *) dev->priv; |
@@ -2768,7 +2768,7 @@ static inline void wv_receive(struct net_device * dev) | |||
2768 | * | 2768 | * |
2769 | * (called in wavelan_packet_xmit()) | 2769 | * (called in wavelan_packet_xmit()) |
2770 | */ | 2770 | */ |
2771 | static inline int wv_packet_write(struct net_device * dev, void *buf, short length) | 2771 | static int wv_packet_write(struct net_device * dev, void *buf, short length) |
2772 | { | 2772 | { |
2773 | net_local *lp = (net_local *) dev->priv; | 2773 | net_local *lp = (net_local *) dev->priv; |
2774 | unsigned long ioaddr = dev->base_addr; | 2774 | unsigned long ioaddr = dev->base_addr; |
@@ -2964,7 +2964,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev) | |||
2964 | * Routine to initialize the Modem Management Controller. | 2964 | * Routine to initialize the Modem Management Controller. |
2965 | * (called by wv_hw_reset()) | 2965 | * (called by wv_hw_reset()) |
2966 | */ | 2966 | */ |
2967 | static inline int wv_mmc_init(struct net_device * dev) | 2967 | static int wv_mmc_init(struct net_device * dev) |
2968 | { | 2968 | { |
2969 | unsigned long ioaddr = dev->base_addr; | 2969 | unsigned long ioaddr = dev->base_addr; |
2970 | net_local *lp = (net_local *) dev->priv; | 2970 | net_local *lp = (net_local *) dev->priv; |
@@ -3136,7 +3136,7 @@ static inline int wv_mmc_init(struct net_device * dev) | |||
3136 | * Start the receive unit. | 3136 | * Start the receive unit. |
3137 | * (called by wv_hw_reset()) | 3137 | * (called by wv_hw_reset()) |
3138 | */ | 3138 | */ |
3139 | static inline int wv_ru_start(struct net_device * dev) | 3139 | static int wv_ru_start(struct net_device * dev) |
3140 | { | 3140 | { |
3141 | net_local *lp = (net_local *) dev->priv; | 3141 | net_local *lp = (net_local *) dev->priv; |
3142 | unsigned long ioaddr = dev->base_addr; | 3142 | unsigned long ioaddr = dev->base_addr; |
@@ -3228,7 +3228,7 @@ static inline int wv_ru_start(struct net_device * dev) | |||
3228 | * | 3228 | * |
3229 | * (called by wv_hw_reset()) | 3229 | * (called by wv_hw_reset()) |
3230 | */ | 3230 | */ |
3231 | static inline int wv_cu_start(struct net_device * dev) | 3231 | static int wv_cu_start(struct net_device * dev) |
3232 | { | 3232 | { |
3233 | net_local *lp = (net_local *) dev->priv; | 3233 | net_local *lp = (net_local *) dev->priv; |
3234 | unsigned long ioaddr = dev->base_addr; | 3234 | unsigned long ioaddr = dev->base_addr; |
@@ -3329,7 +3329,7 @@ static inline int wv_cu_start(struct net_device * dev) | |||
3329 | * | 3329 | * |
3330 | * (called by wv_hw_reset()) | 3330 | * (called by wv_hw_reset()) |
3331 | */ | 3331 | */ |
3332 | static inline int wv_82586_start(struct net_device * dev) | 3332 | static int wv_82586_start(struct net_device * dev) |
3333 | { | 3333 | { |
3334 | net_local *lp = (net_local *) dev->priv; | 3334 | net_local *lp = (net_local *) dev->priv; |
3335 | unsigned long ioaddr = dev->base_addr; | 3335 | unsigned long ioaddr = dev->base_addr; |
@@ -3641,7 +3641,7 @@ static void wv_82586_config(struct net_device * dev) | |||
3641 | * WaveLAN controller (i82586). | 3641 | * WaveLAN controller (i82586). |
3642 | * (called by wavelan_close()) | 3642 | * (called by wavelan_close()) |
3643 | */ | 3643 | */ |
3644 | static inline void wv_82586_stop(struct net_device * dev) | 3644 | static void wv_82586_stop(struct net_device * dev) |
3645 | { | 3645 | { |
3646 | net_local *lp = (net_local *) dev->priv; | 3646 | net_local *lp = (net_local *) dev->priv; |
3647 | unsigned long ioaddr = dev->base_addr; | 3647 | unsigned long ioaddr = dev->base_addr; |