Commit 9c898c36 authored by Martin Dalecki's avatar Martin Dalecki Committed by Linus Torvalds

[PATCH] kill warnings 5/19

Fix improper __FUNCTION__ usage in st680 driver code,
cdc-ether.c. Fix namespace clash in cdc-ether.h
parent dbaf08a0
...@@ -86,7 +86,7 @@ static unsigned int debug = 0; ...@@ -86,7 +86,7 @@ static unsigned int debug = 0;
#define PDEBUG(level, fmt, args...) \ #define PDEBUG(level, fmt, args...) \
do { \ do { \
if (debug >= level) \ if (debug >= level) \
info("[" __PRETTY_FUNCTION__ ":%d] " fmt, __LINE__ , ## args); \ info("[%s:%d] " fmt, __FUNCTION__, __LINE__ , ## args); \
} while (0) } while (0)
......
...@@ -129,13 +129,13 @@ static void read_bulk_callback( struct urb *urb ) ...@@ -129,13 +129,13 @@ static void read_bulk_callback( struct urb *urb )
usb_rcvbulkpipe(ether_dev->usb, ether_dev->data_ep_in), usb_rcvbulkpipe(ether_dev->usb, ether_dev->data_ep_in),
ether_dev->rx_buff, ether_dev->wMaxSegmentSize, ether_dev->rx_buff, ether_dev->wMaxSegmentSize,
read_bulk_callback, ether_dev ); read_bulk_callback, ether_dev );
// Give this to the USB subsystem so it can tell us // Give this to the USB subsystem so it can tell us
// when more data arrives. // when more data arrives.
if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_KERNEL)) ) { if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_KERNEL)) ) {
warn( __FUNCTION__ " failed submint rx_urb %d", res); warn("%s failed submint rx_urb %d", __FUNCTION__, res);
} }
// We are no longer busy, show us the frames!!! // We are no longer busy, show us the frames!!!
ether_dev->flags &= ~CDC_ETHER_RX_BUSY; ether_dev->flags &= ~CDC_ETHER_RX_BUSY;
} }
...@@ -339,7 +339,7 @@ static int CDCEther_open(struct net_device *net) ...@@ -339,7 +339,7 @@ static int CDCEther_open(struct net_device *net)
// Turn on the USB and let the packets flow!!! // Turn on the USB and let the packets flow!!!
if ( (res = enable_net_traffic( ether_dev )) ) { if ( (res = enable_net_traffic( ether_dev )) ) {
err( __FUNCTION__ "can't enable_net_traffic() - %d", res ); err("%s can't enable_net_traffic() - %d", __FUNCTION__, res );
return -EIO; return -EIO;
} }
...@@ -353,7 +353,7 @@ static int CDCEther_open(struct net_device *net) ...@@ -353,7 +353,7 @@ static int CDCEther_open(struct net_device *net)
if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_KERNEL)) ) if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_KERNEL)) )
{ {
// Hmm... Okay... // Hmm... Okay...
warn( __FUNCTION__ " failed rx_urb %d", res ); warn("%s failed rx_urb %d", __FUNCTION__, res );
} }
// Tell the kernel we are ready to start receiving from it // Tell the kernel we are ready to start receiving from it
...@@ -411,6 +411,7 @@ static int CDCEther_ioctl( struct net_device *net, struct ifreq *rq, int cmd ) ...@@ -411,6 +411,7 @@ static int CDCEther_ioctl( struct net_device *net, struct ifreq *rq, int cmd )
} }
} }
#if 0
static void CDC_SetEthernetPacketFilter (ether_dev_t *ether_dev) static void CDC_SetEthernetPacketFilter (ether_dev_t *ether_dev)
{ {
usb_control_msg(ether_dev->usb, usb_control_msg(ether_dev->usb,
...@@ -422,15 +423,15 @@ static void CDC_SetEthernetPacketFilter (ether_dev_t *ether_dev) ...@@ -422,15 +423,15 @@ static void CDC_SetEthernetPacketFilter (ether_dev_t *ether_dev)
NULL, NULL,
0, /* size */ 0, /* size */
HZ); /* timeout */ HZ); /* timeout */
} }
#endif
static void CDCEther_set_multicast( struct net_device *net ) static void CDCEther_set_multicast( struct net_device *net )
{ {
ether_dev_t *ether_dev = net->priv; ether_dev_t *ether_dev = net->priv;
int i; int i;
__u8 *buff; __u8 *buff;
// Tell the kernel to stop sending us frames while we get this // Tell the kernel to stop sending us frames while we get this
// all set up. // all set up.
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define CDC_ETHER_REQ_GET_REGS 0xf0 #define CDC_ETHER_REQ_GET_REGS 0xf0
#define CDC_ETHER_REQ_SET_REGS 0xf1 #define CDC_ETHER_REQ_SET_REGS 0xf1
#define CDC_ETHER_REQ_SET_REG PIPERIDER_REQ_SET_REGS #define CDC_ETHER_REQ_SET_REG PIPERIDER_REQ_SET_REGS
#define ALIGN(x) x __attribute__((aligned(L1_CACHE_BYTES))) #define L1_ALIGN(x) x __attribute__((aligned(L1_CACHE_BYTES)))
#define MODE_FLAG_PROMISCUOUS (1<<0) #define MODE_FLAG_PROMISCUOUS (1<<0)
#define MODE_FLAG_ALL_MULTICAST (1<<1) #define MODE_FLAG_ALL_MULTICAST (1<<1)
...@@ -84,9 +84,9 @@ typedef struct _ether_dev_t { ...@@ -84,9 +84,9 @@ typedef struct _ether_dev_t {
__u8 bNumberPowerFilters; __u8 bNumberPowerFilters;
int intr_interval; int intr_interval;
struct urb *rx_urb, *tx_urb, *intr_urb; struct urb *rx_urb, *tx_urb, *intr_urb;
unsigned char ALIGN(rx_buff[CDC_ETHER_MAX_MTU]); unsigned char L1_ALIGN(rx_buff[CDC_ETHER_MAX_MTU]);
unsigned char ALIGN(tx_buff[CDC_ETHER_MAX_MTU]); unsigned char L1_ALIGN(tx_buff[CDC_ETHER_MAX_MTU]);
unsigned char ALIGN(intr_buff[8]); unsigned char L1_ALIGN(intr_buff[8]);
} ether_dev_t; } ether_dev_t;
#define REQ_HDR_FUNC_DESCR 0x0001 #define REQ_HDR_FUNC_DESCR 0x0001
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment