ChangeSet 1.1165.2.2, 2003/04/23 12:04:22-07:00, akpm@digeo.com
[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 -Nru a/drivers/usb/class/usb-midi.c b/drivers/usb/class/usb-midi.c
--- a/drivers/usb/class/usb-midi.c Thu Apr 24 16:28:38 2003
+++ b/drivers/usb/class/usb-midi.c Thu Apr 24 16:28:38 2003
@@ -820,7 +820,7 @@
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 -Nru a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
--- a/drivers/usb/net/kaweth.c Thu Apr 24 16:28:39 2003
+++ b/drivers/usb/net/kaweth.c Thu Apr 24 16:28:39 2003
@@ -744,7 +744,7 @@
}
}
- 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 -Nru a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
--- a/drivers/usb/net/usbnet.c Thu Apr 24 16:28:38 2003
+++ b/drivers/usb/net/usbnet.c Thu Apr 24 16:28:39 2003
@@ -314,8 +314,12 @@
: (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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Apr 30 2003 - 22:00:19 EST