diff options
| -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, | |||
| 61 | void *cmd, | 61 | void *cmd, |
| 62 | u32 skbtype, | 62 | u32 skbtype, |
| 63 | u32 status); | 63 | u32 status); |
| 64 | static void slic_xmit_timeout(struct net_device *dev); | ||
| 65 | static void slic_config_pci(struct pci_dev *pcidev); | 64 | static void slic_config_pci(struct pci_dev *pcidev); |
| 66 | static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter); | 65 | static struct sk_buff *slic_rcvqueue_getnext(struct adapter *adapter); |
| 67 | 66 | ||
| @@ -90,8 +89,6 @@ static void slic_cmdq_free(struct adapter *adapter); | |||
| 90 | static void slic_cmdq_reset(struct adapter *adapter); | 89 | static void slic_cmdq_reset(struct adapter *adapter); |
| 91 | static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page); | 90 | static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page); |
| 92 | static void slic_cmdq_getdone(struct adapter *adapter); | 91 | static void slic_cmdq_getdone(struct adapter *adapter); |
| 93 | static void slic_cmdq_putdone(struct adapter *adapter, | ||
| 94 | struct slic_hostcmd *cmd); | ||
| 95 | static void slic_cmdq_putdone_irq(struct adapter *adapter, | 92 | static void slic_cmdq_putdone_irq(struct adapter *adapter, |
| 96 | struct slic_hostcmd *cmd); | 93 | struct slic_hostcmd *cmd); |
| 97 | static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter); | 94 | static struct slic_hostcmd *slic_cmdq_getfree(struct adapter *adapter); |
| @@ -103,7 +100,6 @@ static void slic_rcvqueue_free(struct adapter *adapter); | |||
| 103 | static void slic_rcv_handle_error(struct adapter *adapter, | 100 | static void slic_rcv_handle_error(struct adapter *adapter, |
| 104 | struct slic_rcvbuf *rcvbuf); | 101 | struct slic_rcvbuf *rcvbuf); |
| 105 | static void slic_adapter_set_hwaddr(struct adapter *adapter); | 102 | static void slic_adapter_set_hwaddr(struct adapter *adapter); |
| 106 | static void slic_card_halt(struct sliccard *card, struct adapter *adapter); | ||
| 107 | static int slic_card_init(struct sliccard *card, struct adapter *adapter); | 103 | static int slic_card_init(struct sliccard *card, struct adapter *adapter); |
| 108 | static void slic_intagg_set(struct adapter *adapter, u32 value); | 104 | static void slic_intagg_set(struct adapter *adapter, u32 value); |
| 109 | static int slic_card_download(struct adapter *adapter); | 105 | static int slic_card_download(struct adapter *adapter); |
| @@ -120,7 +116,6 @@ static void slic_unmap_mmio_space(struct adapter *adapter); | |||
| 120 | static void slic_card_cleanup(struct sliccard *card); | 116 | static void slic_card_cleanup(struct sliccard *card); |
| 121 | static void slic_init_cleanup(struct adapter *adapter); | 117 | static void slic_init_cleanup(struct adapter *adapter); |
| 122 | static void slic_soft_reset(struct adapter *adapter); | 118 | static void slic_soft_reset(struct adapter *adapter); |
| 123 | static void slic_card_reset(struct adapter *adapter); | ||
| 124 | static bool slic_mac_filter(struct adapter *adapter, | 119 | static bool slic_mac_filter(struct adapter *adapter, |
| 125 | struct ether_header *ether_frame); | 120 | struct ether_header *ether_frame); |
| 126 | static void slic_mac_address_config(struct adapter *adapter); | 121 | static void slic_mac_address_config(struct adapter *adapter); |
| @@ -133,7 +128,6 @@ static void slic_config_set(struct adapter *adapter, bool linkchange); | |||
| 133 | static void slic_config_clear(struct adapter *adapter); | 128 | static void slic_config_clear(struct adapter *adapter); |
| 134 | static void slic_config_get(struct adapter *adapter, u32 config, | 129 | static void slic_config_get(struct adapter *adapter, u32 config, |
| 135 | u32 configh); | 130 | u32 configh); |
| 136 | static void slic_timer_get_stats(ulong device); | ||
| 137 | static void slic_timer_load_check(ulong context); | 131 | static void slic_timer_load_check(ulong context); |
| 138 | static void slic_timer_ping(ulong dev); | 132 | static void slic_timer_ping(ulong dev); |
| 139 | static void slic_assert_fail(void); | 133 | 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) | |||
| 3128 | * 50 seconds or whatever STATS_TIMER_INTERVAL is set to. | 3128 | * 50 seconds or whatever STATS_TIMER_INTERVAL is set to. |
| 3129 | * | 3129 | * |
| 3130 | */ | 3130 | */ |
| 3131 | #if SLIC_GET_STATS_TIMER_ENABLED | ||
| 3131 | static void slic_timer_get_stats(ulong dev) | 3132 | static void slic_timer_get_stats(ulong dev) |
| 3132 | { | 3133 | { |
| 3133 | struct adapter *adapter; | 3134 | struct adapter *adapter; |
| @@ -3163,7 +3164,7 @@ static void slic_timer_get_stats(ulong dev) | |||
| 3163 | SLIC_SECS_TO_JIFFS(STATS_TIMER_INTERVAL); | 3164 | SLIC_SECS_TO_JIFFS(STATS_TIMER_INTERVAL); |
| 3164 | add_timer(&adapter->statstimer); | 3165 | add_timer(&adapter->statstimer); |
| 3165 | } | 3166 | } |
| 3166 | 3167 | #endif | |
| 3167 | static void slic_timer_load_check(ulong cardaddr) | 3168 | static void slic_timer_load_check(ulong cardaddr) |
| 3168 | { | 3169 | { |
| 3169 | struct sliccard *card = (struct sliccard *)cardaddr; | 3170 | struct sliccard *card = (struct sliccard *)cardaddr; |
