diff options
author | John Daiker <daikerjohn@gmail.com> | 2009-02-24 05:16:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:53:04 -0500 |
commit | 99da185a72ba685a5aaf49dff6a5fe83885112e4 (patch) | |
tree | 28a45135872ca5cb0b4f4e37967d361f408231c3 /drivers | |
parent | ddcb5c78e8dcb470caec2049c2f400651f1710e4 (diff) |
b43: checkpatch.pl cleanups
Keeping this one simple.
Changing a few "foo * bar" to "foo *bar"
Removes 22 checkpatch.pl errors, with no introduced warnings.
Signed-off-by: John Daiker <daikerjohn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/debugfs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43/dma.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43/lo.c | 18 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 26 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_g.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/pio.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/b43/rfkill.c | 2 |
7 files changed, 39 insertions, 39 deletions
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c index bc2767da46e8..45e3d6af69f5 100644 --- a/drivers/net/wireless/b43/debugfs.c +++ b/drivers/net/wireless/b43/debugfs.c | |||
@@ -51,8 +51,8 @@ struct b43_debugfs_fops { | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | static inline | 53 | static inline |
54 | struct b43_dfs_file * fops_to_dfs_file(struct b43_wldev *dev, | 54 | struct b43_dfs_file *fops_to_dfs_file(struct b43_wldev *dev, |
55 | const struct b43_debugfs_fops *dfops) | 55 | const struct b43_debugfs_fops *dfops) |
56 | { | 56 | { |
57 | void *p; | 57 | void *p; |
58 | 58 | ||
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index c69b70e0a721..92e1c0189a65 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
@@ -1260,8 +1260,8 @@ static inline int should_inject_overflow(struct b43_dmaring *ring) | |||
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /* Static mapping of mac80211's queues (priorities) to b43 DMA rings. */ | 1262 | /* Static mapping of mac80211's queues (priorities) to b43 DMA rings. */ |
1263 | static struct b43_dmaring * select_ring_by_priority(struct b43_wldev *dev, | 1263 | static struct b43_dmaring *select_ring_by_priority(struct b43_wldev *dev, |
1264 | u8 queue_prio) | 1264 | u8 queue_prio) |
1265 | { | 1265 | { |
1266 | struct b43_dmaring *ring; | 1266 | struct b43_dmaring *ring; |
1267 | 1267 | ||
diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c index 2a4e2b02faf9..22d0fbd83a62 100644 --- a/drivers/net/wireless/b43/lo.c +++ b/drivers/net/wireless/b43/lo.c | |||
@@ -36,8 +36,8 @@ | |||
36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
37 | 37 | ||
38 | 38 | ||
39 | static struct b43_lo_calib * b43_find_lo_calib(struct b43_txpower_lo_control *lo, | 39 | static struct b43_lo_calib *b43_find_lo_calib(struct b43_txpower_lo_control *lo, |
40 | const struct b43_bbatt *bbatt, | 40 | const struct b43_bbatt *bbatt, |
41 | const struct b43_rfatt *rfatt) | 41 | const struct b43_rfatt *rfatt) |
42 | { | 42 | { |
43 | struct b43_lo_calib *c; | 43 | struct b43_lo_calib *c; |
@@ -138,7 +138,7 @@ static u16 lo_measure_feedthrough(struct b43_wldev *dev, | |||
138 | * "pad_mix_gain" is the PAD Mixer Gain. | 138 | * "pad_mix_gain" is the PAD Mixer Gain. |
139 | */ | 139 | */ |
140 | static u16 lo_txctl_register_table(struct b43_wldev *dev, | 140 | static u16 lo_txctl_register_table(struct b43_wldev *dev, |
141 | u16 * value, u16 * pad_mix_gain) | 141 | u16 *value, u16 *pad_mix_gain) |
142 | { | 142 | { |
143 | struct b43_phy *phy = &dev->phy; | 143 | struct b43_phy *phy = &dev->phy; |
144 | u16 reg, v, padmix; | 144 | u16 reg, v, padmix; |
@@ -731,9 +731,9 @@ static void lo_probe_loctls_statemachine(struct b43_wldev *dev, | |||
731 | } | 731 | } |
732 | 732 | ||
733 | static | 733 | static |
734 | struct b43_lo_calib * b43_calibrate_lo_setting(struct b43_wldev *dev, | 734 | struct b43_lo_calib *b43_calibrate_lo_setting(struct b43_wldev *dev, |
735 | const struct b43_bbatt *bbatt, | 735 | const struct b43_bbatt *bbatt, |
736 | const struct b43_rfatt *rfatt) | 736 | const struct b43_rfatt *rfatt) |
737 | { | 737 | { |
738 | struct b43_phy *phy = &dev->phy; | 738 | struct b43_phy *phy = &dev->phy; |
739 | struct b43_phy_g *gphy = phy->g; | 739 | struct b43_phy_g *gphy = phy->g; |
@@ -797,9 +797,9 @@ struct b43_lo_calib * b43_calibrate_lo_setting(struct b43_wldev *dev, | |||
797 | /* Get a calibrated LO setting for the given attenuation values. | 797 | /* Get a calibrated LO setting for the given attenuation values. |
798 | * Might return a NULL pointer under OOM! */ | 798 | * Might return a NULL pointer under OOM! */ |
799 | static | 799 | static |
800 | struct b43_lo_calib * b43_get_calib_lo_settings(struct b43_wldev *dev, | 800 | struct b43_lo_calib *b43_get_calib_lo_settings(struct b43_wldev *dev, |
801 | const struct b43_bbatt *bbatt, | 801 | const struct b43_bbatt *bbatt, |
802 | const struct b43_rfatt *rfatt) | 802 | const struct b43_rfatt *rfatt) |
803 | { | 803 | { |
804 | struct b43_txpower_lo_control *lo = dev->phy.g->lo_control; | 804 | struct b43_txpower_lo_control *lo = dev->phy.g->lo_control; |
805 | struct b43_lo_calib *c; | 805 | struct b43_lo_calib *c; |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 6d52bae4932e..8e1126d99f4c 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -512,7 +512,7 @@ void b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value) | |||
512 | } | 512 | } |
513 | 513 | ||
514 | /* Read HostFlags */ | 514 | /* Read HostFlags */ |
515 | u64 b43_hf_read(struct b43_wldev * dev) | 515 | u64 b43_hf_read(struct b43_wldev *dev) |
516 | { | 516 | { |
517 | u64 ret; | 517 | u64 ret; |
518 | 518 | ||
@@ -600,7 +600,7 @@ void b43_tsf_write(struct b43_wldev *dev, u64 tsf) | |||
600 | } | 600 | } |
601 | 601 | ||
602 | static | 602 | static |
603 | void b43_macfilter_set(struct b43_wldev *dev, u16 offset, const u8 * mac) | 603 | void b43_macfilter_set(struct b43_wldev *dev, u16 offset, const u8 *mac) |
604 | { | 604 | { |
605 | static const u8 zero_addr[ETH_ALEN] = { 0 }; | 605 | static const u8 zero_addr[ETH_ALEN] = { 0 }; |
606 | u16 data; | 606 | u16 data; |
@@ -790,7 +790,7 @@ void b43_dummy_transmission(struct b43_wldev *dev) | |||
790 | } | 790 | } |
791 | 791 | ||
792 | static void key_write(struct b43_wldev *dev, | 792 | static void key_write(struct b43_wldev *dev, |
793 | u8 index, u8 algorithm, const u8 * key) | 793 | u8 index, u8 algorithm, const u8 *key) |
794 | { | 794 | { |
795 | unsigned int i; | 795 | unsigned int i; |
796 | u32 offset; | 796 | u32 offset; |
@@ -812,7 +812,7 @@ static void key_write(struct b43_wldev *dev, | |||
812 | } | 812 | } |
813 | } | 813 | } |
814 | 814 | ||
815 | static void keymac_write(struct b43_wldev *dev, u8 index, const u8 * addr) | 815 | static void keymac_write(struct b43_wldev *dev, u8 index, const u8 *addr) |
816 | { | 816 | { |
817 | u32 addrtmp[2] = { 0, 0, }; | 817 | u32 addrtmp[2] = { 0, 0, }; |
818 | u8 per_sta_keys_start = 8; | 818 | u8 per_sta_keys_start = 8; |
@@ -862,7 +862,7 @@ static void keymac_write(struct b43_wldev *dev, u8 index, const u8 * addr) | |||
862 | 862 | ||
863 | static void do_key_write(struct b43_wldev *dev, | 863 | static void do_key_write(struct b43_wldev *dev, |
864 | u8 index, u8 algorithm, | 864 | u8 index, u8 algorithm, |
865 | const u8 * key, size_t key_len, const u8 * mac_addr) | 865 | const u8 *key, size_t key_len, const u8 *mac_addr) |
866 | { | 866 | { |
867 | u8 buf[B43_SEC_KEYSIZE] = { 0, }; | 867 | u8 buf[B43_SEC_KEYSIZE] = { 0, }; |
868 | u8 per_sta_keys_start = 8; | 868 | u8 per_sta_keys_start = 8; |
@@ -886,8 +886,8 @@ static void do_key_write(struct b43_wldev *dev, | |||
886 | 886 | ||
887 | static int b43_key_write(struct b43_wldev *dev, | 887 | static int b43_key_write(struct b43_wldev *dev, |
888 | int index, u8 algorithm, | 888 | int index, u8 algorithm, |
889 | const u8 * key, size_t key_len, | 889 | const u8 *key, size_t key_len, |
890 | const u8 * mac_addr, | 890 | const u8 *mac_addr, |
891 | struct ieee80211_key_conf *keyconf) | 891 | struct ieee80211_key_conf *keyconf) |
892 | { | 892 | { |
893 | int i; | 893 | int i; |
@@ -1286,7 +1286,7 @@ static void handle_irq_pmq(struct b43_wldev *dev) | |||
1286 | } | 1286 | } |
1287 | 1287 | ||
1288 | static void b43_write_template_common(struct b43_wldev *dev, | 1288 | static void b43_write_template_common(struct b43_wldev *dev, |
1289 | const u8 * data, u16 size, | 1289 | const u8 *data, u16 size, |
1290 | u16 ram_offset, | 1290 | u16 ram_offset, |
1291 | u16 shm_size_offset, u8 rate) | 1291 | u16 shm_size_offset, u8 rate) |
1292 | { | 1292 | { |
@@ -1476,9 +1476,9 @@ static void b43_write_probe_resp_plcp(struct b43_wldev *dev, | |||
1476 | * 2) Patching duration field | 1476 | * 2) Patching duration field |
1477 | * 3) Stripping TIM | 1477 | * 3) Stripping TIM |
1478 | */ | 1478 | */ |
1479 | static const u8 * b43_generate_probe_resp(struct b43_wldev *dev, | 1479 | static const u8 *b43_generate_probe_resp(struct b43_wldev *dev, |
1480 | u16 *dest_size, | 1480 | u16 *dest_size, |
1481 | struct ieee80211_rate *rate) | 1481 | struct ieee80211_rate *rate) |
1482 | { | 1482 | { |
1483 | const u8 *src_data; | 1483 | const u8 *src_data; |
1484 | u8 *dest_data; | 1484 | u8 *dest_data; |
@@ -2980,7 +2980,7 @@ static void b43_security_init(struct b43_wldev *dev) | |||
2980 | b43_clear_keys(dev); | 2980 | b43_clear_keys(dev); |
2981 | } | 2981 | } |
2982 | 2982 | ||
2983 | static int b43_rng_read(struct hwrng *rng, u32 * data) | 2983 | static int b43_rng_read(struct hwrng *rng, u32 *data) |
2984 | { | 2984 | { |
2985 | struct b43_wl *wl = (struct b43_wl *)rng->priv; | 2985 | struct b43_wl *wl = (struct b43_wl *)rng->priv; |
2986 | unsigned long flags; | 2986 | unsigned long flags; |
@@ -3311,7 +3311,7 @@ static void b43_put_phy_into_reset(struct b43_wldev *dev) | |||
3311 | msleep(1); | 3311 | msleep(1); |
3312 | } | 3312 | } |
3313 | 3313 | ||
3314 | static const char * band_to_string(enum ieee80211_band band) | 3314 | static const char *band_to_string(enum ieee80211_band band) |
3315 | { | 3315 | { |
3316 | switch (band) { | 3316 | switch (band) { |
3317 | case IEEE80211_BAND_5GHZ: | 3317 | case IEEE80211_BAND_5GHZ: |
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index 607f17c31310..e7b98f013b0f 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c | |||
@@ -767,7 +767,7 @@ static void b43_calc_nrssi_threshold(struct b43_wldev *dev) | |||
767 | * interference mitigation code. | 767 | * interference mitigation code. |
768 | * It is save to restore values in random order. | 768 | * It is save to restore values in random order. |
769 | */ | 769 | */ |
770 | static void _stack_save(u32 * _stackptr, size_t * stackidx, | 770 | static void _stack_save(u32 *_stackptr, size_t *stackidx, |
771 | u8 id, u16 offset, u16 value) | 771 | u8 id, u16 offset, u16 value) |
772 | { | 772 | { |
773 | u32 *stackptr = &(_stackptr[*stackidx]); | 773 | u32 *stackptr = &(_stackptr[*stackidx]); |
@@ -781,7 +781,7 @@ static void _stack_save(u32 * _stackptr, size_t * stackidx, | |||
781 | B43_WARN_ON(*stackidx >= B43_INTERFSTACK_SIZE); | 781 | B43_WARN_ON(*stackidx >= B43_INTERFSTACK_SIZE); |
782 | } | 782 | } |
783 | 783 | ||
784 | static u16 _stack_restore(u32 * stackptr, u8 id, u16 offset) | 784 | static u16 _stack_restore(u32 *stackptr, u8 id, u16 offset) |
785 | { | 785 | { |
786 | size_t i; | 786 | size_t i; |
787 | 787 | ||
@@ -2350,8 +2350,8 @@ static s8 b43_tssi2dbm_entry(s8 entry[], u8 index, | |||
2350 | return 0; | 2350 | return 0; |
2351 | } | 2351 | } |
2352 | 2352 | ||
2353 | u8 * b43_generate_dyn_tssi2dbm_tab(struct b43_wldev *dev, | 2353 | u8 *b43_generate_dyn_tssi2dbm_tab(struct b43_wldev *dev, |
2354 | s16 pab0, s16 pab1, s16 pab2) | 2354 | s16 pab0, s16 pab1, s16 pab2) |
2355 | { | 2355 | { |
2356 | unsigned int i; | 2356 | unsigned int i; |
2357 | u8 *tab; | 2357 | u8 *tab; |
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c index 1036bef8c4cc..8cd9776752e6 100644 --- a/drivers/net/wireless/b43/pio.c +++ b/drivers/net/wireless/b43/pio.c | |||
@@ -55,8 +55,8 @@ static u16 generate_cookie(struct b43_pio_txqueue *q, | |||
55 | } | 55 | } |
56 | 56 | ||
57 | static | 57 | static |
58 | struct b43_pio_txqueue * parse_cookie(struct b43_wldev *dev, | 58 | struct b43_pio_txqueue *parse_cookie(struct b43_wldev *dev, |
59 | u16 cookie, | 59 | u16 cookie, |
60 | struct b43_pio_txpacket **pack) | 60 | struct b43_pio_txpacket **pack) |
61 | { | 61 | { |
62 | struct b43_pio *pio = &dev->pio; | 62 | struct b43_pio *pio = &dev->pio; |
@@ -134,8 +134,8 @@ static u16 pio_rxqueue_offset(struct b43_wldev *dev) | |||
134 | return 8; | 134 | return 8; |
135 | } | 135 | } |
136 | 136 | ||
137 | static struct b43_pio_txqueue * b43_setup_pioqueue_tx(struct b43_wldev *dev, | 137 | static struct b43_pio_txqueue *b43_setup_pioqueue_tx(struct b43_wldev *dev, |
138 | unsigned int index) | 138 | unsigned int index) |
139 | { | 139 | { |
140 | struct b43_pio_txqueue *q; | 140 | struct b43_pio_txqueue *q; |
141 | struct b43_pio_txpacket *p; | 141 | struct b43_pio_txpacket *p; |
@@ -171,8 +171,8 @@ static struct b43_pio_txqueue * b43_setup_pioqueue_tx(struct b43_wldev *dev, | |||
171 | return q; | 171 | return q; |
172 | } | 172 | } |
173 | 173 | ||
174 | static struct b43_pio_rxqueue * b43_setup_pioqueue_rx(struct b43_wldev *dev, | 174 | static struct b43_pio_rxqueue *b43_setup_pioqueue_rx(struct b43_wldev *dev, |
175 | unsigned int index) | 175 | unsigned int index) |
176 | { | 176 | { |
177 | struct b43_pio_rxqueue *q; | 177 | struct b43_pio_rxqueue *q; |
178 | 178 | ||
@@ -308,8 +308,8 @@ err_destroy_bk: | |||
308 | } | 308 | } |
309 | 309 | ||
310 | /* Static mapping of mac80211's queues (priorities) to b43 PIO queues. */ | 310 | /* Static mapping of mac80211's queues (priorities) to b43 PIO queues. */ |
311 | static struct b43_pio_txqueue * select_queue_by_priority(struct b43_wldev *dev, | 311 | static struct b43_pio_txqueue *select_queue_by_priority(struct b43_wldev *dev, |
312 | u8 queue_prio) | 312 | u8 queue_prio) |
313 | { | 313 | { |
314 | struct b43_pio_txqueue *q; | 314 | struct b43_pio_txqueue *q; |
315 | 315 | ||
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c index 713753781f40..afad42358693 100644 --- a/drivers/net/wireless/b43/rfkill.c +++ b/drivers/net/wireless/b43/rfkill.c | |||
@@ -113,7 +113,7 @@ out_unlock: | |||
113 | return err; | 113 | return err; |
114 | } | 114 | } |
115 | 115 | ||
116 | char * b43_rfkill_led_name(struct b43_wldev *dev) | 116 | char *b43_rfkill_led_name(struct b43_wldev *dev) |
117 | { | 117 | { |
118 | struct b43_rfkill *rfk = &(dev->wl->rfkill); | 118 | struct b43_rfkill *rfk = &(dev->wl->rfkill); |
119 | 119 | ||