]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From 4578ca0fc2be611ea98618b028ecfbb2415cd990 Mon Sep 17 00:00:00 2001 |
2 | From: Lior Dotan <liodot@gmail.com> | |
3 | Date: Sun, 5 Oct 2008 15:35:46 +0300 | |
4 | Subject: [PATCH 20/23] Staging: SLICOSS: Fix warnings due to static usage | |
5 | Patch-mainline: 2.6.28 | |
6 | ||
7 | Fix a few warning messages that crept in due to conversion of all the | |
8 | functions to static | |
9 | ||
10 | Signed-off-by: Lior Dotan <liodot@gmail.com> | |
11 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
12 | --- | |
13 | drivers/staging/slicoss/slicinc.h | 6 ------ | |
14 | drivers/staging/slicoss/slicoss.c | 3 ++- | |
15 | 2 files changed, 2 insertions(+), 7 deletions(-) | |
16 | ||
17 | diff --git a/drivers/staging/slicoss/slicinc.h b/drivers/staging/slicoss/slicinc.h | |
18 | index 610c1ab..71288c4 100644 | |
19 | --- a/drivers/staging/slicoss/slicinc.h | |
20 | +++ b/drivers/staging/slicoss/slicinc.h | |
21 | @@ -61,7 +61,6 @@ static void slic_xmit_fail(struct adapter *adapter, | |
22 | void *cmd, | |
23 | u32 skbtype, | |
24 | u32 status); | |
25 | -static void slic_xmit_timeout(struct net_device *dev); | |
26 | static void slic_config_pci(struct pci_dev *pcidev); | |
27 | static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter); | |
28 | ||
29 | @@ -90,8 +89,6 @@ static void slic_cmdq_free(struct adapter *adapter); | |
30 | static void slic_cmdq_reset(struct adapter *adapter); | |
31 | static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page); | |
32 | static void slic_cmdq_getdone(struct adapter *adapter); | |
33 | -static void slic_cmdq_putdone(struct adapter *adapter, | |
34 | - struct slic_hostcmd *cmd); | |
35 | static void slic_cmdq_putdone_irq(struct adapter *adapter, | |
36 | struct slic_hostcmd *cmd); | |
37 | static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter); | |
38 | @@ -103,7 +100,6 @@ static void slic_rcvqueue_free(struct adapter *adapter); | |
39 | static void slic_rcv_handle_error(struct adapter *adapter, | |
40 | struct slic_rcvbuf *rcvbuf); | |
41 | static void slic_adapter_set_hwaddr(struct adapter *adapter); | |
42 | -static void slic_card_halt(struct sliccard *card, struct adapter *adapter); | |
43 | static int slic_card_init(struct sliccard *card, struct adapter *adapter); | |
44 | static void slic_intagg_set(struct adapter *adapter, u32 value); | |
45 | static int slic_card_download(struct adapter *adapter); | |
46 | @@ -120,7 +116,6 @@ static void slic_unmap_mmio_space(struct adapter *adapter); | |
47 | static void slic_card_cleanup(struct sliccard *card); | |
48 | static void slic_init_cleanup(struct adapter *adapter); | |
49 | static void slic_soft_reset(struct adapter *adapter); | |
50 | -static void slic_card_reset(struct adapter *adapter); | |
51 | static bool slic_mac_filter(struct adapter *adapter, | |
52 | struct ether_header *ether_frame); | |
53 | static void slic_mac_address_config(struct adapter *adapter); | |
54 | @@ -133,7 +128,6 @@ static void slic_config_set(struct adapter *adapter, bool linkchange); | |
55 | static void slic_config_clear(struct adapter *adapter); | |
56 | static void slic_config_get(struct adapter *adapter, u32 config, | |
57 | u32 configh); | |
58 | -static void slic_timer_get_stats(ulong device); | |
59 | static void slic_timer_load_check(ulong context); | |
60 | static void slic_timer_ping(ulong dev); | |
61 | static void slic_assert_fail(void); | |
62 | diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c | |
63 | index eb61565..f242477 100644 | |
64 | --- a/drivers/staging/slicoss/slicoss.c | |
65 | +++ b/drivers/staging/slicoss/slicoss.c | |
66 | @@ -3128,6 +3128,7 @@ static int slic_mac_set_address(struct net_device *dev, void *ptr) | |
67 | * 50 seconds or whatever STATS_TIMER_INTERVAL is set to. | |
68 | * | |
69 | */ | |
70 | +#if SLIC_GET_STATS_TIMER_ENABLED | |
71 | static void slic_timer_get_stats(ulong dev) | |
72 | { | |
73 | struct adapter *adapter; | |
74 | @@ -3163,7 +3164,7 @@ static void slic_timer_get_stats(ulong dev) | |
75 | SLIC_SECS_TO_JIFFS(STATS_TIMER_INTERVAL); | |
76 | add_timer(&adapter->statstimer); | |
77 | } | |
78 | - | |
79 | +#endif | |
80 | static void slic_timer_load_check(ulong cardaddr) | |
81 | { | |
82 | struct sliccard *card = (struct sliccard *)cardaddr; | |
83 | -- | |
84 | 1.6.0.2 | |
85 |