Skip to content

Commit

Permalink
b43: checkpatch.pl cleanups
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
John Daiker authored and John W. Linville committed Feb 27, 2009
1 parent ddcb5c7 commit 99da185
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/b43/debugfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ struct b43_debugfs_fops {
};

static inline
struct b43_dfs_file * fops_to_dfs_file(struct b43_wldev *dev,
const struct b43_debugfs_fops *dfops)
struct b43_dfs_file *fops_to_dfs_file(struct b43_wldev *dev,
const struct b43_debugfs_fops *dfops)
{
void *p;

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/b43/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,8 +1260,8 @@ static inline int should_inject_overflow(struct b43_dmaring *ring)
}

/* Static mapping of mac80211's queues (priorities) to b43 DMA rings. */
static struct b43_dmaring * select_ring_by_priority(struct b43_wldev *dev,
u8 queue_prio)
static struct b43_dmaring *select_ring_by_priority(struct b43_wldev *dev,
u8 queue_prio)
{
struct b43_dmaring *ring;

Expand Down
18 changes: 9 additions & 9 deletions drivers/net/wireless/b43/lo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#include <linux/sched.h>


static struct b43_lo_calib * b43_find_lo_calib(struct b43_txpower_lo_control *lo,
const struct b43_bbatt *bbatt,
static struct b43_lo_calib *b43_find_lo_calib(struct b43_txpower_lo_control *lo,
const struct b43_bbatt *bbatt,
const struct b43_rfatt *rfatt)
{
struct b43_lo_calib *c;
Expand Down Expand Up @@ -138,7 +138,7 @@ static u16 lo_measure_feedthrough(struct b43_wldev *dev,
* "pad_mix_gain" is the PAD Mixer Gain.
*/
static u16 lo_txctl_register_table(struct b43_wldev *dev,
u16 * value, u16 * pad_mix_gain)
u16 *value, u16 *pad_mix_gain)
{
struct b43_phy *phy = &dev->phy;
u16 reg, v, padmix;
Expand Down Expand Up @@ -731,9 +731,9 @@ static void lo_probe_loctls_statemachine(struct b43_wldev *dev,
}

static
struct b43_lo_calib * b43_calibrate_lo_setting(struct b43_wldev *dev,
const struct b43_bbatt *bbatt,
const struct b43_rfatt *rfatt)
struct b43_lo_calib *b43_calibrate_lo_setting(struct b43_wldev *dev,
const struct b43_bbatt *bbatt,
const struct b43_rfatt *rfatt)
{
struct b43_phy *phy = &dev->phy;
struct b43_phy_g *gphy = phy->g;
Expand Down Expand Up @@ -797,9 +797,9 @@ struct b43_lo_calib * b43_calibrate_lo_setting(struct b43_wldev *dev,
/* Get a calibrated LO setting for the given attenuation values.
* Might return a NULL pointer under OOM! */
static
struct b43_lo_calib * b43_get_calib_lo_settings(struct b43_wldev *dev,
const struct b43_bbatt *bbatt,
const struct b43_rfatt *rfatt)
struct b43_lo_calib *b43_get_calib_lo_settings(struct b43_wldev *dev,
const struct b43_bbatt *bbatt,
const struct b43_rfatt *rfatt)
{
struct b43_txpower_lo_control *lo = dev->phy.g->lo_control;
struct b43_lo_calib *c;
Expand Down
26 changes: 13 additions & 13 deletions drivers/net/wireless/b43/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ void b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value)
}

/* Read HostFlags */
u64 b43_hf_read(struct b43_wldev * dev)
u64 b43_hf_read(struct b43_wldev *dev)
{
u64 ret;

Expand Down Expand Up @@ -600,7 +600,7 @@ void b43_tsf_write(struct b43_wldev *dev, u64 tsf)
}

static
void b43_macfilter_set(struct b43_wldev *dev, u16 offset, const u8 * mac)
void b43_macfilter_set(struct b43_wldev *dev, u16 offset, const u8 *mac)
{
static const u8 zero_addr[ETH_ALEN] = { 0 };
u16 data;
Expand Down Expand Up @@ -790,7 +790,7 @@ void b43_dummy_transmission(struct b43_wldev *dev)
}

static void key_write(struct b43_wldev *dev,
u8 index, u8 algorithm, const u8 * key)
u8 index, u8 algorithm, const u8 *key)
{
unsigned int i;
u32 offset;
Expand All @@ -812,7 +812,7 @@ static void key_write(struct b43_wldev *dev,
}
}

static void keymac_write(struct b43_wldev *dev, u8 index, const u8 * addr)
static void keymac_write(struct b43_wldev *dev, u8 index, const u8 *addr)
{
u32 addrtmp[2] = { 0, 0, };
u8 per_sta_keys_start = 8;
Expand Down Expand Up @@ -862,7 +862,7 @@ static void keymac_write(struct b43_wldev *dev, u8 index, const u8 * addr)

static void do_key_write(struct b43_wldev *dev,
u8 index, u8 algorithm,
const u8 * key, size_t key_len, const u8 * mac_addr)
const u8 *key, size_t key_len, const u8 *mac_addr)
{
u8 buf[B43_SEC_KEYSIZE] = { 0, };
u8 per_sta_keys_start = 8;
Expand All @@ -886,8 +886,8 @@ static void do_key_write(struct b43_wldev *dev,

static int b43_key_write(struct b43_wldev *dev,
int index, u8 algorithm,
const u8 * key, size_t key_len,
const u8 * mac_addr,
const u8 *key, size_t key_len,
const u8 *mac_addr,
struct ieee80211_key_conf *keyconf)
{
int i;
Expand Down Expand Up @@ -1286,7 +1286,7 @@ static void handle_irq_pmq(struct b43_wldev *dev)
}

static void b43_write_template_common(struct b43_wldev *dev,
const u8 * data, u16 size,
const u8 *data, u16 size,
u16 ram_offset,
u16 shm_size_offset, u8 rate)
{
Expand Down Expand Up @@ -1476,9 +1476,9 @@ static void b43_write_probe_resp_plcp(struct b43_wldev *dev,
* 2) Patching duration field
* 3) Stripping TIM
*/
static const u8 * b43_generate_probe_resp(struct b43_wldev *dev,
u16 *dest_size,
struct ieee80211_rate *rate)
static const u8 *b43_generate_probe_resp(struct b43_wldev *dev,
u16 *dest_size,
struct ieee80211_rate *rate)
{
const u8 *src_data;
u8 *dest_data;
Expand Down Expand Up @@ -2980,7 +2980,7 @@ static void b43_security_init(struct b43_wldev *dev)
b43_clear_keys(dev);
}

static int b43_rng_read(struct hwrng *rng, u32 * data)
static int b43_rng_read(struct hwrng *rng, u32 *data)
{
struct b43_wl *wl = (struct b43_wl *)rng->priv;
unsigned long flags;
Expand Down Expand Up @@ -3311,7 +3311,7 @@ static void b43_put_phy_into_reset(struct b43_wldev *dev)
msleep(1);
}

static const char * band_to_string(enum ieee80211_band band)
static const char *band_to_string(enum ieee80211_band band)
{
switch (band) {
case IEEE80211_BAND_5GHZ:
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/b43/phy_g.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ static void b43_calc_nrssi_threshold(struct b43_wldev *dev)
* interference mitigation code.
* It is save to restore values in random order.
*/
static void _stack_save(u32 * _stackptr, size_t * stackidx,
static void _stack_save(u32 *_stackptr, size_t *stackidx,
u8 id, u16 offset, u16 value)
{
u32 *stackptr = &(_stackptr[*stackidx]);
Expand All @@ -781,7 +781,7 @@ static void _stack_save(u32 * _stackptr, size_t * stackidx,
B43_WARN_ON(*stackidx >= B43_INTERFSTACK_SIZE);
}

static u16 _stack_restore(u32 * stackptr, u8 id, u16 offset)
static u16 _stack_restore(u32 *stackptr, u8 id, u16 offset)
{
size_t i;

Expand Down Expand Up @@ -2350,8 +2350,8 @@ static s8 b43_tssi2dbm_entry(s8 entry[], u8 index,
return 0;
}

u8 * b43_generate_dyn_tssi2dbm_tab(struct b43_wldev *dev,
s16 pab0, s16 pab1, s16 pab2)
u8 *b43_generate_dyn_tssi2dbm_tab(struct b43_wldev *dev,
s16 pab0, s16 pab1, s16 pab2)
{
unsigned int i;
u8 *tab;
Expand Down
16 changes: 8 additions & 8 deletions drivers/net/wireless/b43/pio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ static u16 generate_cookie(struct b43_pio_txqueue *q,
}

static
struct b43_pio_txqueue * parse_cookie(struct b43_wldev *dev,
u16 cookie,
struct b43_pio_txqueue *parse_cookie(struct b43_wldev *dev,
u16 cookie,
struct b43_pio_txpacket **pack)
{
struct b43_pio *pio = &dev->pio;
Expand Down Expand Up @@ -134,8 +134,8 @@ static u16 pio_rxqueue_offset(struct b43_wldev *dev)
return 8;
}

static struct b43_pio_txqueue * b43_setup_pioqueue_tx(struct b43_wldev *dev,
unsigned int index)
static struct b43_pio_txqueue *b43_setup_pioqueue_tx(struct b43_wldev *dev,
unsigned int index)
{
struct b43_pio_txqueue *q;
struct b43_pio_txpacket *p;
Expand Down Expand Up @@ -171,8 +171,8 @@ static struct b43_pio_txqueue * b43_setup_pioqueue_tx(struct b43_wldev *dev,
return q;
}

static struct b43_pio_rxqueue * b43_setup_pioqueue_rx(struct b43_wldev *dev,
unsigned int index)
static struct b43_pio_rxqueue *b43_setup_pioqueue_rx(struct b43_wldev *dev,
unsigned int index)
{
struct b43_pio_rxqueue *q;

Expand Down Expand Up @@ -308,8 +308,8 @@ int b43_pio_init(struct b43_wldev *dev)
}

/* Static mapping of mac80211's queues (priorities) to b43 PIO queues. */
static struct b43_pio_txqueue * select_queue_by_priority(struct b43_wldev *dev,
u8 queue_prio)
static struct b43_pio_txqueue *select_queue_by_priority(struct b43_wldev *dev,
u8 queue_prio)
{
struct b43_pio_txqueue *q;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/b43/rfkill.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
return err;
}

char * b43_rfkill_led_name(struct b43_wldev *dev)
char *b43_rfkill_led_name(struct b43_wldev *dev)
{
struct b43_rfkill *rfk = &(dev->wl->rfkill);

Expand Down

0 comments on commit 99da185

Please sign in to comment.