[PATCH] kill warnings 5/19

Fix improper __FUNCTION__ usage in st680 driver code,
cdc-ether.c. Fix namespace clash in cdc-ether.h

drivers/usb/media/stv680.c

@@ -86,7 +86,7 @@ static unsigned int debug = 0;
 #define PDEBUG(level, fmt, args...) \
 	do { \
 	if (debug >= level)	\
-		info("[" __PRETTY_FUNCTION__ ":%d] " fmt, __LINE__ , ## args);	\
+		info("[%s:%d] " fmt, __FUNCTION__, __LINE__ , ## args);	\
 	} while (0)
 
 

drivers/usb/net/cdc-ether.c

@@ -133,7 +133,7 @@ static void read_bulk_callback( struct urb *urb )
 	// Give this to the USB subsystem so it can tell us
 	// when more data arrives.
 	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!!!
@@ -339,7 +339,7 @@ static int CDCEther_open(struct net_device *net)
 
 	// Turn on the USB and let the packets flow!!!
 	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;
 	}
 
@@ -353,7 +353,7 @@ static int CDCEther_open(struct net_device *net)
 	if ( (res = usb_submit_urb(ether_dev->rx_urb, GFP_KERNEL)) )
 	{
 		// 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
@@ -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)
 {
 	usb_control_msg(ether_dev->usb,
@@ -423,7 +424,7 @@ static void CDC_SetEthernetPacketFilter (ether_dev_t *ether_dev)
 			0, /* size */
 			HZ); /* timeout */
 }
-
+#endif
 
 static void CDCEther_set_multicast( struct net_device *net )
 {

drivers/usb/net/cdc-ether.h

@@ -43,7 +43,7 @@
 #define	CDC_ETHER_REQ_GET_REGS	0xf0
 #define	CDC_ETHER_REQ_SET_REGS	0xf1
 #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_ALL_MULTICAST (1<<1)
@@ -84,9 +84,9 @@ typedef struct _ether_dev_t {
 	__u8			bNumberPowerFilters;
 	int			intr_interval;
 	struct urb		*rx_urb, *tx_urb, *intr_urb;
-	unsigned char		ALIGN(rx_buff[CDC_ETHER_MAX_MTU]);
-	unsigned char		ALIGN(tx_buff[CDC_ETHER_MAX_MTU]);
-	unsigned char		ALIGN(intr_buff[8]);
+	unsigned char		L1_ALIGN(rx_buff[CDC_ETHER_MAX_MTU]);
+	unsigned char		L1_ALIGN(tx_buff[CDC_ETHER_MAX_MTU]);
+	unsigned char		L1_ALIGN(intr_buff[8]);
 } ether_dev_t;
 
 #define REQ_HDR_FUNC_DESCR	0x0001