Commit d87e3442 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman

[PATCH] usb: minor usb stuff

- nail a couple of warnings

- usbnet is not compilable with gcc-2.95.3.  Fix.
parent 28b8a8d9
...@@ -820,7 +820,7 @@ static int usb_midi_open(struct inode *inode, struct file *file) ...@@ -820,7 +820,7 @@ static int usb_midi_open(struct inode *inode, struct file *file)
struct list_head *devs, *mdevs; struct list_head *devs, *mdevs;
struct usb_midi_state *s; struct usb_midi_state *s;
struct usb_mididev *m; struct usb_mididev *m;
int flags; unsigned long flags;
int succeed = 0; int succeed = 0;
#if 0 #if 0
......
...@@ -744,7 +744,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) ...@@ -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); *private_header = cpu_to_le16(skb->len-2);
kaweth->tx_skb = skb; kaweth->tx_skb = skb;
......
...@@ -314,8 +314,12 @@ MODULE_PARM_DESC (msg_level, "Initial message level (default = 1)"); ...@@ -314,8 +314,12 @@ MODULE_PARM_DESC (msg_level, "Initial message level (default = 1)");
: (in_interrupt () ? "in_interrupt" : "can sleep")) : (in_interrupt () ? "in_interrupt" : "can sleep"))
#ifdef DEBUG #ifdef DEBUG
#define devdbg(usbnet, fmt, arg...) \ #define devdbg(usbnet, fmt, arg...) \
printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net.name, ## arg) do { \
printk(KERN_DEBUG "%s:", (usbnet)->net.name); \
printk(fmt, ## arg); \
printk("\n"); \
} while (0)
#else #else
#define devdbg(usbnet, fmt, arg...) do {} while(0) #define devdbg(usbnet, fmt, arg...) do {} while(0)
#endif #endif
......
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