From d87e34428aa55ca72b957c2e14285a82c1a5d3e8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 22 Apr 2003 22:04:22 -0700 Subject: [PATCH] [PATCH] usb: minor usb stuff - nail a couple of warnings - usbnet is not compilable with gcc-2.95.3. Fix. --- drivers/usb/class/usb-midi.c | 2 +- drivers/usb/net/kaweth.c | 2 +- drivers/usb/net/usbnet.c | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/usb/class/usb-midi.c b/drivers/usb/class/usb-midi.c index b38f962ff2cb8..1c188426bc220 100644 --- a/drivers/usb/class/usb-midi.c +++ b/drivers/usb/class/usb-midi.c @@ -820,7 +820,7 @@ static int usb_midi_open(struct inode *inode, struct file *file) struct list_head *devs, *mdevs; struct usb_midi_state *s; struct usb_mididev *m; - int flags; + unsigned long flags; int succeed = 0; #if 0 diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c index f00f98ba08736..6063b2e1a0a41 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/usb/net/kaweth.c @@ -744,7 +744,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) } } - private_header = __skb_push(skb, 2); + private_header = (u16 *)__skb_push(skb, 2); *private_header = cpu_to_le16(skb->len-2); kaweth->tx_skb = skb; diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 626603f664896..547ed86a721ad 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c @@ -314,8 +314,12 @@ MODULE_PARM_DESC (msg_level, "Initial message level (default = 1)"); : (in_interrupt () ? "in_interrupt" : "can sleep")) #ifdef DEBUG -#define devdbg(usbnet, fmt, arg...) \ - printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net.name, ## arg) +#define devdbg(usbnet, fmt, arg...) \ + do { \ + printk(KERN_DEBUG "%s:", (usbnet)->net.name); \ + printk(fmt, ## arg); \ + printk("\n"); \ + } while (0) #else #define devdbg(usbnet, fmt, arg...) do {} while(0) #endif -- 2.53.0