diff options
| author | Lior Dotan <liodot@gmail.com> | 2008-10-05 15:35:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-10 15:31:13 -0700 |
| commit | 4578ca0fc2be611ea98618b028ecfbb2415cd990 (patch) | |
| tree | 5e70d8ee332bf577783b1d7428375d6d43dc72ad /drivers/staging | |
| parent | e9eff9d6a0d14fa2e85953ce4115d243ff575e78 (diff) | |
| download | linux-stable-4578ca0fc2be611ea98618b028ecfbb2415cd990.tar.gz linux-stable-4578ca0fc2be611ea98618b028ecfbb2415cd990.tar.bz2 linux-stable-4578ca0fc2be611ea98618b028ecfbb2415cd990.zip | |
Staging: SLICOSS: Fix warnings due to static usage
Fix a few warning messages that crept in due to conversion of all the
functions to static
Signed-off-by: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/slicoss/slicinc.h | 6 | ||||
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/slicoss/slicinc.h b/drivers/staging/slicoss/slicinc.h index 610c1abd988b..71288c4f7be3 100644 --- a/drivers/staging/slicoss/slicinc.h +++ b/drivers/staging/slicoss/slicinc.h @@ -61,7 +61,6 @@ static void slic_xmit_fail(struct adapter *adapter, void *cmd, u32 skbtype, u32 status); -static void slic_xmit_timeout(struct net_device *dev); static void slic_config_pci(struct pci_dev *pcidev); static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter); @@ -90,8 +89,6 @@ static void slic_cmdq_free(struct adapter *adapter); static void slic_cmdq_reset(struct adapter *adapter); static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page); static void slic_cmdq_getdone(struct adapter *adapter); -static void slic_cmdq_putdone(struct adapter *adapter, - struct slic_hostcmd *cmd); static void slic_cmdq_putdone_irq(struct adapter *adapter, struct slic_hostcmd *cmd); static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter); @@ -103,7 +100,6 @@ static void slic_rcvqueue_free(struct adapter *adapter); static void slic_rcv_handle_error(struct adapter *adapter, struct slic_rcvbuf *rcvbuf); static void slic_adapter_set_hwaddr(struct adapter *adapter); -static void slic_card_halt(struct sliccard *card, struct adapter *adapter); static int slic_card_init(struct sliccard *card, struct adapter *adapter); static void slic_intagg_set(struct adapter *adapter, u32 value); static int slic_card_download(struct adapter *adapter); @@ -120,7 +116,6 @@ static void slic_unmap_mmio_space(struct adapter *adapter); static void slic_card_cleanup(struct sliccard *card); static void slic_init_cleanup(struct adapter *adapter); static void slic_soft_reset(struct adapter *adapter); -static void slic_card_reset(struct adapter *adapter); static bool slic_mac_filter(struct adapter *adapter, struct ether_header *ether_frame); static void slic_mac_address_config(struct adapter *adapter); @@ -133,7 +128,6 @@ static void slic_config_set(struct adapter *adapter, bool linkchange); static void slic_config_clear(struct adapter *adapter); static void slic_config_get(struct adapter *adapter, u32 config, u32 configh); -static void slic_timer_get_stats(ulong device); static void slic_timer_load_check(ulong context); static void slic_timer_ping(ulong dev); static void slic_assert_fail(void); diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index eb615652a08a..f24247797262 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -3128,6 +3128,7 @@ static int slic_mac_set_address(struct net_device *dev, void *ptr) * 50 seconds or whatever STATS_TIMER_INTERVAL is set to. * */ +#if SLIC_GET_STATS_TIMER_ENABLED static void slic_timer_get_stats(ulong dev) { struct adapter *adapter; @@ -3163,7 +3164,7 @@ static void slic_timer_get_stats(ulong dev) SLIC_SECS_TO_JIFFS(STATS_TIMER_INTERVAL); add_timer(&adapter->statstimer); } - +#endif static void slic_timer_load_check(ulong cardaddr) { struct sliccard *card = (struct sliccard *)cardaddr; |