diff options
author | Maciej W. Rozycki <macro@linux-mips.org> | 2014-06-28 21:09:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-02 21:26:29 -0400 |
commit | 1b037474d0c0b5ceb65bc809e3d8ac4497ee041b (patch) | |
tree | 9ecd1f2c4df355436ffef4d0c5520229bd77c858 | |
parent | f46d53d0e9151ea9553361d2bf044ba555350e5f (diff) |
defxx: Fix !DYNAMIC_BUFFERS compilation warnings
This fixes compilation warnings:
drivers/net/fddi/defxx.c:294: warning: 'dfx_rcv_flush' declared inline after being called
drivers/net/fddi/defxx.c:294: warning: previous declaration of 'dfx_rcv_flush' was here
drivers/net/fddi/defxx.c:2854: warning: 'my_skb_align' defined but not used
triggered when the driver is built with DYNAMIC_BUFFERS undefined. Code
tested to work just fine with these changes and a few DEFPA and DEFTA
boards.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/fddi/defxx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 052927be074b..2aa57270838f 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c | |||
@@ -291,7 +291,11 @@ static int dfx_hw_dma_uninit(DFX_board_t *bp, PI_UINT32 type); | |||
291 | 291 | ||
292 | static int dfx_rcv_init(DFX_board_t *bp, int get_buffers); | 292 | static int dfx_rcv_init(DFX_board_t *bp, int get_buffers); |
293 | static void dfx_rcv_queue_process(DFX_board_t *bp); | 293 | static void dfx_rcv_queue_process(DFX_board_t *bp); |
294 | #ifdef DYNAMIC_BUFFERS | ||
294 | static void dfx_rcv_flush(DFX_board_t *bp); | 295 | static void dfx_rcv_flush(DFX_board_t *bp); |
296 | #else | ||
297 | static inline void dfx_rcv_flush(DFX_board_t *bp) {} | ||
298 | #endif | ||
295 | 299 | ||
296 | static netdev_tx_t dfx_xmt_queue_pkt(struct sk_buff *skb, | 300 | static netdev_tx_t dfx_xmt_queue_pkt(struct sk_buff *skb, |
297 | struct net_device *dev); | 301 | struct net_device *dev); |
@@ -2849,7 +2853,7 @@ static int dfx_hw_dma_uninit(DFX_board_t *bp, PI_UINT32 type) | |||
2849 | * Align an sk_buff to a boundary power of 2 | 2853 | * Align an sk_buff to a boundary power of 2 |
2850 | * | 2854 | * |
2851 | */ | 2855 | */ |
2852 | 2856 | #ifdef DYNAMIC_BUFFERS | |
2853 | static void my_skb_align(struct sk_buff *skb, int n) | 2857 | static void my_skb_align(struct sk_buff *skb, int n) |
2854 | { | 2858 | { |
2855 | unsigned long x = (unsigned long)skb->data; | 2859 | unsigned long x = (unsigned long)skb->data; |
@@ -2859,7 +2863,7 @@ static void my_skb_align(struct sk_buff *skb, int n) | |||
2859 | 2863 | ||
2860 | skb_reserve(skb, v - x); | 2864 | skb_reserve(skb, v - x); |
2861 | } | 2865 | } |
2862 | 2866 | #endif | |
2863 | 2867 | ||
2864 | /* | 2868 | /* |
2865 | * ================ | 2869 | * ================ |
@@ -3450,10 +3454,6 @@ static void dfx_rcv_flush( DFX_board_t *bp ) | |||
3450 | } | 3454 | } |
3451 | 3455 | ||
3452 | } | 3456 | } |
3453 | #else | ||
3454 | static inline void dfx_rcv_flush( DFX_board_t *bp ) | ||
3455 | { | ||
3456 | } | ||
3457 | #endif /* DYNAMIC_BUFFERS */ | 3457 | #endif /* DYNAMIC_BUFFERS */ |
3458 | 3458 | ||
3459 | /* | 3459 | /* |