UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Maciej W. Rozycki 2014-06-29 02:09:19 +01:00 committed by David S. Miller
parent f46d53d0e9
commit 1b037474d0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/fddi/defxx.c
View File

@ -291,7 +291,11 @@ static int dfx_hw_dma_uninit(DFX_board_t *bp, PI_UINT32 type);
static int dfx_rcv_init(DFX_board_t *bp, int get_buffers); static int dfx_rcv_init(DFX_board_t *bp, int get_buffers);
static void dfx_rcv_queue_process(DFX_board_t *bp); static void dfx_rcv_queue_process(DFX_board_t *bp);
#ifdef DYNAMIC_BUFFERS
static void dfx_rcv_flush(DFX_board_t *bp); static void dfx_rcv_flush(DFX_board_t *bp);
#else
static inline void dfx_rcv_flush(DFX_board_t *bp) {}
#endif
static netdev_tx_t dfx_xmt_queue_pkt(struct sk_buff *skb, static netdev_tx_t dfx_xmt_queue_pkt(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
@ -2849,7 +2853,7 @@ static int dfx_hw_dma_uninit(DFX_board_t *bp, PI_UINT32 type)
* Align an sk_buff to a boundary power of 2 * Align an sk_buff to a boundary power of 2
* *
*/ */
#ifdef DYNAMIC_BUFFERS
static void my_skb_align(struct sk_buff *skb, int n) static void my_skb_align(struct sk_buff *skb, int n)
{ {
unsigned long x = (unsigned long)skb->data; unsigned long x = (unsigned long)skb->data;
@ -2859,7 +2863,7 @@ static void my_skb_align(struct sk_buff *skb, int n)
skb_reserve(skb, v - x); skb_reserve(skb, v - x);
} }
#endif
/* /*
* ================ * ================
@ -3450,10 +3454,6 @@ static void dfx_rcv_flush( DFX_board_t *bp )
} }
} }
#else
static inline void dfx_rcv_flush( DFX_board_t *bp )
{
}
#endif /* DYNAMIC_BUFFERS */ #endif /* DYNAMIC_BUFFERS */
/* /*