More unclutterance.
Move <linux/usb_input.h> to <linux/usb/input.h> and remove some
redundant includes.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Index: linux-2.6/drivers/usb/input/touchkitusb.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/touchkitusb.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/touchkitusb.c 2006-06-13 10:02:15.000000000 -0700
@@ -27,11 +27,9 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#define TOUCHKIT_MIN_XC 0x0
#define TOUCHKIT_MAX_XC 0x07ff
Index: linux-2.6/drivers/usb/input/hid-input.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/hid-input.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/hid-input.c 2006-06-13 10:02:15.000000000 -0700
@@ -29,9 +29,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/kernel.h>
-#include <linux/input.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#undef DEBUG
Index: linux-2.6/drivers/usb/input/itmtouch.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/itmtouch.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/itmtouch.c 2006-06-13 10:02:15.000000000 -0700
@@ -42,11 +42,9 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
/* only an 8 byte buffer necessary for a single packet */
#define ITM_BUFSIZE 8
Index: linux-2.6/drivers/usb/input/ati_remote.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/ati_remote.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/ati_remote.c 2006-06-13 10:02:15.000000000 -0700
@@ -92,9 +92,7 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/input.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include <linux/wait.h>
#include <linux/jiffies.h>
Index: linux-2.6/drivers/usb/input/aiptek.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/aiptek.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/aiptek.c 2006-06-13 10:02:15.000000000 -0700
@@ -73,11 +73,9 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include <linux/sched.h>
#include <asm/uaccess.h>
#include <asm/unaligned.h>
Index: linux-2.6/drivers/usb/input/powermate.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/powermate.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/powermate.c 2006-06-13 10:02:15.000000000 -0700
@@ -30,12 +30,10 @@
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/spinlock.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#define POWERMATE_VENDOR 0x077d /* Griffin Technology, Inc. */
#define POWERMATE_PRODUCT_NEW 0x0410 /* Griffin PowerMate */
Index: linux-2.6/drivers/usb/input/wacom.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/wacom.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/wacom.c 2006-06-13 10:02:15.000000000 -0700
@@ -69,13 +69,10 @@
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include <asm/unaligned.h>
-#include <asm/byteorder.h>
/*
* Version Information
Index: linux-2.6/drivers/usb/input/kbtab.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/kbtab.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/kbtab.c 2006-06-13 10:02:15.000000000 -0700
@@ -1,12 +1,9 @@
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include <asm/unaligned.h>
-#include <asm/byteorder.h>
/*
* Version Information
Index: linux-2.6/drivers/media/video/usbvideo/konicawc.c
===================================================================
--- linux-2.6.orig/drivers/media/video/usbvideo/konicawc.c 2006-04-17 20:29:18.000000000 -0700
+++ linux-2.6/drivers/media/video/usbvideo/konicawc.c 2006-06-13 10:02:15.000000000 -0700
@@ -15,8 +15,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include "usbvideo.h"
Index: linux-2.6/drivers/usb/input/appletouch.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/appletouch.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/appletouch.c 2006-06-13 10:02:15.000000000 -0700
@@ -32,9 +32,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/input.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
/* Apple has powerbooks which have the keyboard with different Product IDs */
#define APPLE_VENDOR_ID 0x05AC
Index: linux-2.6/drivers/usb/input/mtouchusb.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/mtouchusb.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/mtouchusb.c 2006-06-13 10:02:15.000000000 -0700
@@ -42,11 +42,9 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#define MTOUCHUSB_MIN_XC 0x0
#define MTOUCHUSB_MAX_RAW_XC 0x4000
Index: linux-2.6/drivers/usb/input/usbkbd.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/usbkbd.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/usbkbd.c 2006-06-13 10:02:15.000000000 -0700
@@ -29,10 +29,8 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/input.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
/*
* Version Information
Index: linux-2.6/drivers/usb/input/acecad.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/acecad.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/acecad.c 2006-06-13 10:02:15.000000000 -0700
@@ -27,11 +27,9 @@
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
/*
* Version Information
Index: linux-2.6/drivers/usb/input/yealink.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/yealink.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/yealink.c 2006-06-13 10:02:15.000000000 -0700
@@ -48,13 +48,11 @@
#include <linux/config.h>
#include <linux/kernel.h>
-#include <linux/input.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/rwsem.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include "map_to_7segment.h"
#include "yealink.h"
Index: linux-2.6/drivers/usb/storage/onetouch.c
===================================================================
--- linux-2.6.orig/drivers/usb/storage/onetouch.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/storage/onetouch.c 2006-06-13 10:02:36.000000000 -0700
@@ -34,9 +34,8 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include <linux/usb.h>
#include <linux/usb_ch9.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include "usb.h"
#include "onetouch.h"
#include "debug.h"
Index: linux-2.6/drivers/usb/input/usbmouse.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/usbmouse.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/usbmouse.c 2006-06-13 10:02:15.000000000 -0700
@@ -28,11 +28,9 @@
#include <linux/kernel.h>
#include <linux/slab.h>
-#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
/*
* Version Information
Index: linux-2.6/drivers/usb/input/xpad.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/xpad.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/xpad.c 2006-06-13 10:02:15.000000000 -0700
@@ -56,13 +56,11 @@
#include <linux/config.h>
#include <linux/kernel.h>
-#include <linux/input.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/smp_lock.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#define DRIVER_VERSION "v0.0.5"
#define DRIVER_AUTHOR "Marko Friedemann <[EMAIL PROTECTED]>"
Index: linux-2.6/drivers/usb/input/keyspan_remote.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/keyspan_remote.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/keyspan_remote.c 2006-06-13 10:02:15.000000000 -0700
@@ -18,9 +18,7 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/input.h>
-#include <linux/usb.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#define DRIVER_VERSION "v0.1"
#define DRIVER_AUTHOR "Michael Downey <[EMAIL PROTECTED]>"
Index: linux-2.6/drivers/usb/input/ati_remote2.c
===================================================================
--- linux-2.6.orig/drivers/usb/input/ati_remote2.c 2006-04-17 20:29:21.000000000 -0700
+++ linux-2.6/drivers/usb/input/ati_remote2.c 2006-06-13 10:02:15.000000000 -0700
@@ -8,7 +8,7 @@
* as published by the Free Software Foundation.
*/
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#define DRIVER_DESC "ATI/Philips USB RF remote driver"
#define DRIVER_VERSION "0.1"
Index: linux-2.6/include/linux/usb_input.h
===================================================================
--- linux-2.6.orig/include/linux/usb_input.h 2006-04-17 20:29:33.000000000 -0700
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-#ifndef __USB_INPUT_H
-#define __USB_INPUT_H
-
-/*
- * Copyright (C) 2005 Dmitry Torokhov
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-
-#include <linux/usb.h>
-#include <linux/input.h>
-#include <asm/byteorder.h>
-
-static inline void
-usb_to_input_id(const struct usb_device *dev, struct input_id *id)
-{
- id->bustype = BUS_USB;
- id->vendor = le16_to_cpu(dev->descriptor.idVendor);
- id->product = le16_to_cpu(dev->descriptor.idProduct);
- id->version = le16_to_cpu(dev->descriptor.bcdDevice);
-}
-
-#endif
Index: linux-2.6/include/linux/usb/input.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6/include/linux/usb/input.h 2006-06-13 10:02:15.000000000 -0700
@@ -0,0 +1,25 @@
+#ifndef __USB_INPUT_H
+#define __USB_INPUT_H
+
+/*
+ * Copyright (C) 2005 Dmitry Torokhov
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#include <linux/usb.h>
+#include <linux/input.h>
+#include <asm/byteorder.h>
+
+static inline void
+usb_to_input_id(const struct usb_device *dev, struct input_id *id)
+{
+ id->bustype = BUS_USB;
+ id->vendor = le16_to_cpu(dev->descriptor.idVendor);
+ id->product = le16_to_cpu(dev->descriptor.idProduct);
+ id->version = le16_to_cpu(dev->descriptor.bcdDevice);
+}
+
+#endif
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
