Skip to content

Commit

Permalink
wl12xx: mark some symbols static
Browse files Browse the repository at this point in the history
after re-factoring a bunch of symbols are only
used inside main.c which allows us to mark
them as static.

Signed-off-by: Felipe Balbi <balbi@ti.com>
[forward-ported]
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Felipe Balbi authored and Luciano Coelho committed Oct 11, 2011
1 parent a390e85 commit 4b32a2c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
9 changes: 2 additions & 7 deletions drivers/net/wireless/wl12xx/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,10 @@ u16 wl1271_top_reg_read(struct wl1271 *wl, int addr);
int wl1271_set_partition(struct wl1271 *wl,
struct wl1271_partition_set *p);

bool wl1271_set_block_size(struct wl1271 *wl);

/* Functions from wl1271_main.c */

int wl1271_register_hw(struct wl1271 *wl);
void wl1271_unregister_hw(struct wl1271 *wl);
int wl1271_init_ieee80211(struct wl1271 *wl);
struct ieee80211_hw *wl1271_alloc_hw(void);
int wl1271_free_hw(struct wl1271 *wl);
irqreturn_t wl1271_irq(int irq, void *data);
bool wl1271_set_block_size(struct wl1271 *wl);
int wl1271_tx_dummy_packet(struct wl1271 *wl);

#endif
18 changes: 6 additions & 12 deletions drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ static void wl1271_netstack_work(struct work_struct *work)

#define WL1271_IRQ_MAX_LOOPS 256

irqreturn_t wl1271_irq(int irq, void *cookie)
static irqreturn_t wl1271_irq(int irq, void *cookie)
{
int ret;
u32 intr;
Expand Down Expand Up @@ -1053,7 +1053,6 @@ irqreturn_t wl1271_irq(int irq, void *cookie)

return IRQ_HANDLED;
}
EXPORT_SYMBOL_GPL(wl1271_irq);

static int wl1271_fetch_firmware(struct wl1271 *wl)
{
Expand Down Expand Up @@ -4848,7 +4847,7 @@ static struct bin_attribute fwlog_attr = {
.read = wl1271_sysfs_read_fwlog,
};

int wl1271_register_hw(struct wl1271 *wl)
static int wl1271_register_hw(struct wl1271 *wl)
{
int ret;

Expand Down Expand Up @@ -4889,9 +4888,8 @@ int wl1271_register_hw(struct wl1271 *wl)

return 0;
}
EXPORT_SYMBOL_GPL(wl1271_register_hw);

void wl1271_unregister_hw(struct wl1271 *wl)
static void wl1271_unregister_hw(struct wl1271 *wl)
{
if (wl->state == WL1271_STATE_PLT)
__wl1271_plt_stop(wl);
Expand All @@ -4901,9 +4899,8 @@ void wl1271_unregister_hw(struct wl1271 *wl)
wl->mac80211_registered = false;

}
EXPORT_SYMBOL_GPL(wl1271_unregister_hw);

int wl1271_init_ieee80211(struct wl1271 *wl)
static int wl1271_init_ieee80211(struct wl1271 *wl)
{
static const u32 cipher_suites[] = {
WLAN_CIPHER_SUITE_WEP40,
Expand Down Expand Up @@ -4989,11 +4986,10 @@ int wl1271_init_ieee80211(struct wl1271 *wl)

return 0;
}
EXPORT_SYMBOL_GPL(wl1271_init_ieee80211);

#define WL1271_DEFAULT_CHANNEL 0

struct ieee80211_hw *wl1271_alloc_hw(void)
static struct ieee80211_hw *wl1271_alloc_hw(void)
{
struct ieee80211_hw *hw;
struct platform_device *plat_dev = NULL;
Expand Down Expand Up @@ -5162,9 +5158,8 @@ struct ieee80211_hw *wl1271_alloc_hw(void)

return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(wl1271_alloc_hw);

int wl1271_free_hw(struct wl1271 *wl)
static int wl1271_free_hw(struct wl1271 *wl)
{
/* Unblock any fwlog readers */
mutex_lock(&wl->mutex);
Expand Down Expand Up @@ -5199,7 +5194,6 @@ int wl1271_free_hw(struct wl1271 *wl)

return 0;
}
EXPORT_SYMBOL_GPL(wl1271_free_hw);

static irqreturn_t wl12xx_hardirq(int irq, void *cookie)
{
Expand Down

0 comments on commit 4b32a2c

Please sign in to comment.