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/ipw2200.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/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index cdfe50207757..819be2b6b7df 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -813,7 +813,7 @@ static void ipw_bg_led_link_off(void *data) | |||
813 | up(&priv->sem); | 813 | up(&priv->sem); |
814 | } | 814 | } |
815 | 815 | ||
816 | static inline void __ipw_led_activity_on(struct ipw_priv *priv) | 816 | static void __ipw_led_activity_on(struct ipw_priv *priv) |
817 | { | 817 | { |
818 | u32 led; | 818 | u32 led; |
819 | 819 | ||
@@ -1508,7 +1508,7 @@ static ssize_t store_direct_dword(struct device *d, | |||
1508 | static DEVICE_ATTR(direct_dword, S_IWUSR | S_IRUGO, | 1508 | static DEVICE_ATTR(direct_dword, S_IWUSR | S_IRUGO, |
1509 | show_direct_dword, store_direct_dword); | 1509 | show_direct_dword, store_direct_dword); |
1510 | 1510 | ||
1511 | static inline int rf_kill_active(struct ipw_priv *priv) | 1511 | static int rf_kill_active(struct ipw_priv *priv) |
1512 | { | 1512 | { |
1513 | if (0 == (ipw_read32(priv, 0x30) & 0x10000)) | 1513 | if (0 == (ipw_read32(priv, 0x30) & 0x10000)) |
1514 | priv->status |= STATUS_RF_KILL_HW; | 1514 | priv->status |= STATUS_RF_KILL_HW; |
@@ -2359,7 +2359,7 @@ static inline void eeprom_write_reg(struct ipw_priv *p, u32 data) | |||
2359 | } | 2359 | } |
2360 | 2360 | ||
2361 | /* perform a chip select operation */ | 2361 | /* perform a chip select operation */ |
2362 | static inline void eeprom_cs(struct ipw_priv *priv) | 2362 | static void eeprom_cs(struct ipw_priv *priv) |
2363 | { | 2363 | { |
2364 | eeprom_write_reg(priv, 0); | 2364 | eeprom_write_reg(priv, 0); |
2365 | eeprom_write_reg(priv, EEPROM_BIT_CS); | 2365 | eeprom_write_reg(priv, EEPROM_BIT_CS); |
@@ -2368,7 +2368,7 @@ static inline void eeprom_cs(struct ipw_priv *priv) | |||
2368 | } | 2368 | } |
2369 | 2369 | ||
2370 | /* perform a chip select operation */ | 2370 | /* perform a chip select operation */ |
2371 | static inline void eeprom_disable_cs(struct ipw_priv *priv) | 2371 | static void eeprom_disable_cs(struct ipw_priv *priv) |
2372 | { | 2372 | { |
2373 | eeprom_write_reg(priv, EEPROM_BIT_CS); | 2373 | eeprom_write_reg(priv, EEPROM_BIT_CS); |
2374 | eeprom_write_reg(priv, 0); | 2374 | eeprom_write_reg(priv, 0); |
@@ -2475,7 +2475,7 @@ static void ipw_eeprom_init_sram(struct ipw_priv *priv) | |||
2475 | IPW_DEBUG_TRACE("<<\n"); | 2475 | IPW_DEBUG_TRACE("<<\n"); |
2476 | } | 2476 | } |
2477 | 2477 | ||
2478 | static inline void ipw_zero_memory(struct ipw_priv *priv, u32 start, u32 count) | 2478 | static void ipw_zero_memory(struct ipw_priv *priv, u32 start, u32 count) |
2479 | { | 2479 | { |
2480 | count >>= 2; | 2480 | count >>= 2; |
2481 | if (!count) | 2481 | if (!count) |
@@ -2772,7 +2772,7 @@ static inline int ipw_alive(struct ipw_priv *priv) | |||
2772 | return ipw_read32(priv, 0x90) == 0xd55555d5; | 2772 | return ipw_read32(priv, 0x90) == 0xd55555d5; |
2773 | } | 2773 | } |
2774 | 2774 | ||
2775 | static inline int ipw_poll_bit(struct ipw_priv *priv, u32 addr, u32 mask, | 2775 | static int ipw_poll_bit(struct ipw_priv *priv, u32 addr, u32 mask, |
2776 | int timeout) | 2776 | int timeout) |
2777 | { | 2777 | { |
2778 | int i = 0; | 2778 | int i = 0; |
@@ -3150,7 +3150,7 @@ static int ipw_get_fw(struct ipw_priv *priv, | |||
3150 | 3150 | ||
3151 | #define IPW_RX_BUF_SIZE (3000) | 3151 | #define IPW_RX_BUF_SIZE (3000) |
3152 | 3152 | ||
3153 | static inline void ipw_rx_queue_reset(struct ipw_priv *priv, | 3153 | static void ipw_rx_queue_reset(struct ipw_priv *priv, |
3154 | struct ipw_rx_queue *rxq) | 3154 | struct ipw_rx_queue *rxq) |
3155 | { | 3155 | { |
3156 | unsigned long flags; | 3156 | unsigned long flags; |
@@ -3608,7 +3608,7 @@ static void ipw_tx_queue_free(struct ipw_priv *priv) | |||
3608 | ipw_queue_tx_free(priv, &priv->txq[3]); | 3608 | ipw_queue_tx_free(priv, &priv->txq[3]); |
3609 | } | 3609 | } |
3610 | 3610 | ||
3611 | static inline void ipw_create_bssid(struct ipw_priv *priv, u8 * bssid) | 3611 | static void ipw_create_bssid(struct ipw_priv *priv, u8 * bssid) |
3612 | { | 3612 | { |
3613 | /* First 3 bytes are manufacturer */ | 3613 | /* First 3 bytes are manufacturer */ |
3614 | bssid[0] = priv->mac_addr[0]; | 3614 | bssid[0] = priv->mac_addr[0]; |
@@ -3622,7 +3622,7 @@ static inline void ipw_create_bssid(struct ipw_priv *priv, u8 * bssid) | |||
3622 | bssid[0] |= 0x02; /* set local assignment bit (IEEE802) */ | 3622 | bssid[0] |= 0x02; /* set local assignment bit (IEEE802) */ |
3623 | } | 3623 | } |
3624 | 3624 | ||
3625 | static inline u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid) | 3625 | static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid) |
3626 | { | 3626 | { |
3627 | struct ipw_station_entry entry; | 3627 | struct ipw_station_entry entry; |
3628 | int i; | 3628 | int i; |
@@ -3655,7 +3655,7 @@ static inline u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid) | |||
3655 | return i; | 3655 | return i; |
3656 | } | 3656 | } |
3657 | 3657 | ||
3658 | static inline u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid) | 3658 | static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid) |
3659 | { | 3659 | { |
3660 | int i; | 3660 | int i; |
3661 | 3661 | ||
@@ -3794,7 +3794,7 @@ static void inline average_init(struct average *avg) | |||
3794 | memset(avg, 0, sizeof(*avg)); | 3794 | memset(avg, 0, sizeof(*avg)); |
3795 | } | 3795 | } |
3796 | 3796 | ||
3797 | static void inline average_add(struct average *avg, s16 val) | 3797 | static void average_add(struct average *avg, s16 val) |
3798 | { | 3798 | { |
3799 | avg->sum -= avg->entries[avg->pos]; | 3799 | avg->sum -= avg->entries[avg->pos]; |
3800 | avg->sum += val; | 3800 | avg->sum += val; |
@@ -3805,7 +3805,7 @@ static void inline average_add(struct average *avg, s16 val) | |||
3805 | } | 3805 | } |
3806 | } | 3806 | } |
3807 | 3807 | ||
3808 | static s16 inline average_value(struct average *avg) | 3808 | static s16 average_value(struct average *avg) |
3809 | { | 3809 | { |
3810 | if (!unlikely(avg->init)) { | 3810 | if (!unlikely(avg->init)) { |
3811 | if (avg->pos) | 3811 | if (avg->pos) |
@@ -3847,7 +3847,7 @@ static void ipw_reset_stats(struct ipw_priv *priv) | |||
3847 | 3847 | ||
3848 | } | 3848 | } |
3849 | 3849 | ||
3850 | static inline u32 ipw_get_max_rate(struct ipw_priv *priv) | 3850 | static u32 ipw_get_max_rate(struct ipw_priv *priv) |
3851 | { | 3851 | { |
3852 | u32 i = 0x80000000; | 3852 | u32 i = 0x80000000; |
3853 | u32 mask = priv->rates_mask; | 3853 | u32 mask = priv->rates_mask; |
@@ -4087,7 +4087,7 @@ static void ipw_bg_gather_stats(void *data) | |||
4087 | * roaming_threshold -> disassociate_threshold, scan and roam for better signal. | 4087 | * roaming_threshold -> disassociate_threshold, scan and roam for better signal. |
4088 | * Above disassociate threshold, give up and stop scanning. | 4088 | * Above disassociate threshold, give up and stop scanning. |
4089 | * Roaming is disabled if disassociate_threshold <= roaming_threshold */ | 4089 | * Roaming is disabled if disassociate_threshold <= roaming_threshold */ |
4090 | static inline void ipw_handle_missed_beacon(struct ipw_priv *priv, | 4090 | static void ipw_handle_missed_beacon(struct ipw_priv *priv, |
4091 | int missed_count) | 4091 | int missed_count) |
4092 | { | 4092 | { |
4093 | priv->notif_missed_beacons = missed_count; | 4093 | priv->notif_missed_beacons = missed_count; |
@@ -4157,7 +4157,7 @@ static inline void ipw_handle_missed_beacon(struct ipw_priv *priv, | |||
4157 | * Handle host notification packet. | 4157 | * Handle host notification packet. |
4158 | * Called from interrupt routine | 4158 | * Called from interrupt routine |
4159 | */ | 4159 | */ |
4160 | static inline void ipw_rx_notification(struct ipw_priv *priv, | 4160 | static void ipw_rx_notification(struct ipw_priv *priv, |
4161 | struct ipw_rx_notification *notif) | 4161 | struct ipw_rx_notification *notif) |
4162 | { | 4162 | { |
4163 | notif->size = le16_to_cpu(notif->size); | 4163 | notif->size = le16_to_cpu(notif->size); |
@@ -5095,7 +5095,7 @@ static int ipw_compatible_rates(struct ipw_priv *priv, | |||
5095 | return 1; | 5095 | return 1; |
5096 | } | 5096 | } |
5097 | 5097 | ||
5098 | static inline void ipw_copy_rates(struct ipw_supported_rates *dest, | 5098 | static void ipw_copy_rates(struct ipw_supported_rates *dest, |
5099 | const struct ipw_supported_rates *src) | 5099 | const struct ipw_supported_rates *src) |
5100 | { | 5100 | { |
5101 | u8 i; | 5101 | u8 i; |
@@ -5856,7 +5856,7 @@ static void ipw_debug_config(struct ipw_priv *priv) | |||
5856 | #define ipw_debug_config(x) do {} while (0) | 5856 | #define ipw_debug_config(x) do {} while (0) |
5857 | #endif | 5857 | #endif |
5858 | 5858 | ||
5859 | static inline void ipw_set_fixed_rate(struct ipw_priv *priv, int mode) | 5859 | static void ipw_set_fixed_rate(struct ipw_priv *priv, int mode) |
5860 | { | 5860 | { |
5861 | /* TODO: Verify that this works... */ | 5861 | /* TODO: Verify that this works... */ |
5862 | struct ipw_fixed_rate fr = { | 5862 | struct ipw_fixed_rate fr = { |
@@ -7634,7 +7634,7 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv, | |||
7634 | } | 7634 | } |
7635 | #endif | 7635 | #endif |
7636 | 7636 | ||
7637 | static inline int is_network_packet(struct ipw_priv *priv, | 7637 | static int is_network_packet(struct ipw_priv *priv, |
7638 | struct ieee80211_hdr_4addr *header) | 7638 | struct ieee80211_hdr_4addr *header) |
7639 | { | 7639 | { |
7640 | /* Filter incoming packets to determine if they are targetted toward | 7640 | /* Filter incoming packets to determine if they are targetted toward |
@@ -7672,7 +7672,7 @@ static inline int is_network_packet(struct ipw_priv *priv, | |||
7672 | 7672 | ||
7673 | #define IPW_PACKET_RETRY_TIME HZ | 7673 | #define IPW_PACKET_RETRY_TIME HZ |
7674 | 7674 | ||
7675 | static inline int is_duplicate_packet(struct ipw_priv *priv, | 7675 | static int is_duplicate_packet(struct ipw_priv *priv, |
7676 | struct ieee80211_hdr_4addr *header) | 7676 | struct ieee80211_hdr_4addr *header) |
7677 | { | 7677 | { |
7678 | u16 sc = le16_to_cpu(header->seq_ctl); | 7678 | u16 sc = le16_to_cpu(header->seq_ctl); |
@@ -9581,7 +9581,7 @@ static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev) | |||
9581 | 9581 | ||
9582 | /* net device stuff */ | 9582 | /* net device stuff */ |
9583 | 9583 | ||
9584 | static inline void init_sys_config(struct ipw_sys_config *sys_config) | 9584 | static void init_sys_config(struct ipw_sys_config *sys_config) |
9585 | { | 9585 | { |
9586 | memset(sys_config, 0, sizeof(struct ipw_sys_config)); | 9586 | memset(sys_config, 0, sizeof(struct ipw_sys_config)); |
9587 | sys_config->bt_coexistence = 1; /* We may need to look into prvStaBtConfig */ | 9587 | sys_config->bt_coexistence = 1; /* We may need to look into prvStaBtConfig */ |
@@ -9627,7 +9627,7 @@ modify to send one tfd per fragment instead of using chunking. otherwise | |||
9627 | we need to heavily modify the ieee80211_skb_to_txb. | 9627 | we need to heavily modify the ieee80211_skb_to_txb. |
9628 | */ | 9628 | */ |
9629 | 9629 | ||
9630 | static inline int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, | 9630 | static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb, |
9631 | int pri) | 9631 | int pri) |
9632 | { | 9632 | { |
9633 | struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *) | 9633 | struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *) |