more patches upstream removed

13 files changed, 9 insertions, 1155 deletions

diff --git a/driver-core-platform-convert-bus-code-to-use-dev_groups.patch b/driver-core-platform-convert-bus-code-to-use-dev_groups.patch
deleted file mode 100644
index cb6473ca53ad3f..00000000000000
--- a/driver-core-platform-convert-bus-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From foo@baz Fri Aug 23 14:13:45 PDT 2013
-Date: Fri, 23 Aug 2013 14:13:45 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: driver-core: platform: convert bus code to use dev_groups
-
-The dev_attrs field of struct bus_type is going away soon, dev_groups
-should be used instead.  This converts the platform bus code to use
-the correct field.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/base/platform.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/base/platform.c
-+++ b/drivers/base/platform.c
-@@ -672,11 +672,13 @@ static ssize_t modalias_show(struct devi
- 
- 	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
- }
-+static DEVICE_ATTR_RO(modalias);
- 
--static struct device_attribute platform_dev_attrs[] = {
--	__ATTR_RO(modalias),
--	__ATTR_NULL,
-+static struct attribute *platform_dev_attrs[] = {
-+	&dev_attr_modalias.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(platform_dev);
- 
- static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
- {
-@@ -893,7 +895,7 @@ static const struct dev_pm_ops platform_
- 
- struct bus_type platform_bus_type = {
- 	.name		= "platform",
--	.dev_attrs	= platform_dev_attrs,
-+	.dev_groups	= platform_dev_groups,
- 	.match		= platform_match,
- 	.uevent		= platform_uevent,
- 	.pm		= &platform_dev_pm_ops,
diff --git a/hid-convert-bus-code-to-use-dev_groups.patch b/hid-convert-bus-code-to-use-dev_groups.patch
deleted file mode 100644
index 933bcbce5b4d69..00000000000000
--- a/hid-convert-bus-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Fri Aug 23 14:15:14 PDT 2013
-Date: Fri, 23 Aug 2013 14:15:14 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: HID: convert bus code to use dev_groups
-
-The dev_attrs field of struct bus_type is going away soon, dev_groups
-should be used instead.  This converts the HID bus code to use
-the correct field.
-
-Cc: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/hid/hid-core.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1917,11 +1917,13 @@ static ssize_t modalias_show(struct devi
- 
- 	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
- }
-+static DEVICE_ATTR_RO(modalias);
- 
--static struct device_attribute hid_dev_attrs[] = {
--	__ATTR_RO(modalias),
--	__ATTR_NULL,
-+static struct attribute *hid_dev_attrs[] = {
-+	&dev_attr_modalias.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(hid_dev);
- 
- static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
- {
-@@ -1949,7 +1951,7 @@ static int hid_uevent(struct device *dev
- 
- static struct bus_type hid_bus_type = {
- 	.name		= "hid",
--	.dev_attrs	= hid_dev_attrs,
-+	.dev_groups	= hid_dev_groups,
- 	.match		= hid_bus_match,
- 	.probe		= hid_device_probe,
- 	.remove		= hid_device_remove,
diff --git a/input-gameport-convert-bus-code-to-use-drv_groups.patch b/input-gameport-convert-bus-code-to-use-drv_groups.patch
deleted file mode 100644
index bc05c271cffe76..00000000000000
--- a/input-gameport-convert-bus-code-to-use-drv_groups.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From foo@baz Fri Aug 23 13:59:38 PDT 2013
-Date: Fri, 23 Aug 2013 13:59:38 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: Input: gameport: convert bus code to use drv_groups
-
-The drv_attrs field of struct bus_type is going away soon, drv_groups
-should be used instead.  This converts the gameport bus code to use the
-correct field.
-
-Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/input/gameport/gameport.c |   12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
---- a/drivers/input/gameport/gameport.c
-+++ b/drivers/input/gameport/gameport.c
-@@ -639,16 +639,18 @@ EXPORT_SYMBOL(gameport_unregister_port);
-  * Gameport driver operations
-  */
- 
--static ssize_t gameport_driver_show_description(struct device_driver *drv, char *buf)
-+static ssize_t description_show(struct device_driver *drv, char *buf)
- {
- 	struct gameport_driver *driver = to_gameport_driver(drv);
- 	return sprintf(buf, "%s\n", driver->description ? driver->description : "(none)");
- }
-+static DRIVER_ATTR_RO(description);
- 
--static struct driver_attribute gameport_driver_attrs[] = {
--	__ATTR(description, S_IRUGO, gameport_driver_show_description, NULL),
--	__ATTR_NULL
-+static struct attribute *gameport_driver_attrs[] = {
-+	&driver_attr_description.attr,
-+	NULL
- };
-+ATTRIBUTE_GROUPS(gameport_driver);
- 
- static int gameport_driver_probe(struct device *dev)
- {
-@@ -749,7 +751,7 @@ static int gameport_bus_match(struct dev
- static struct bus_type gameport_bus = {
- 	.name		= "gameport",
- 	.dev_attrs	= gameport_device_attrs,
--	.drv_attrs	= gameport_driver_attrs,
-+	.drv_groups	= gameport_driver_groups,
- 	.match		= gameport_bus_match,
- 	.probe		= gameport_driver_probe,
- 	.remove		= gameport_driver_remove,
diff --git a/input-serio-convert-bus-code-to-use-drv_groups.patch b/input-serio-convert-bus-code-to-use-drv_groups.patch
deleted file mode 100644
index bfb6b8520602a3..00000000000000
--- a/input-serio-convert-bus-code-to-use-drv_groups.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From foo@baz Fri Aug 23 13:59:46 PDT 2013
-Date: Fri, 23 Aug 2013 13:59:46 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: Input: serio: convert bus code to use drv_groups
-
-The drv_attrs field of struct bus_type is going away soon, drv_groups
-should be used instead.  This converts the serio bus code to use the
-correct field.
-
-Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/input/serio/serio.c |   21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
---- a/drivers/input/serio/serio.c
-+++ b/drivers/input/serio/serio.c
-@@ -732,19 +732,20 @@ EXPORT_SYMBOL(serio_unregister_child_por
-  * Serio driver operations
-  */
- 
--static ssize_t serio_driver_show_description(struct device_driver *drv, char *buf)
-+static ssize_t description_show(struct device_driver *drv, char *buf)
- {
- 	struct serio_driver *driver = to_serio_driver(drv);
- 	return sprintf(buf, "%s\n", driver->description ? driver->description : "(none)");
- }
-+static DRIVER_ATTR_RO(description);
- 
--static ssize_t serio_driver_show_bind_mode(struct device_driver *drv, char *buf)
-+static ssize_t bind_mode_show(struct device_driver *drv, char *buf)
- {
- 	struct serio_driver *serio_drv = to_serio_driver(drv);
- 	return sprintf(buf, "%s\n", serio_drv->manual_bind ? "manual" : "auto");
- }
- 
--static ssize_t serio_driver_set_bind_mode(struct device_driver *drv, const char *buf, size_t count)
-+static ssize_t bind_mode_store(struct device_driver *drv, const char *buf, size_t count)
- {
- 	struct serio_driver *serio_drv = to_serio_driver(drv);
- 	int retval;
-@@ -760,14 +761,14 @@ static ssize_t serio_driver_set_bind_mod
- 
- 	return retval;
- }
-+static DRIVER_ATTR_RW(bind_mode);
- 
--
--static struct driver_attribute serio_driver_attrs[] = {
--	__ATTR(description, S_IRUGO, serio_driver_show_description, NULL),
--	__ATTR(bind_mode, S_IWUSR | S_IRUGO,
--		serio_driver_show_bind_mode, serio_driver_set_bind_mode),
--	__ATTR_NULL
-+static struct attribute *serio_driver_attrs[] = {
-+	&driver_attr_description.attr,
-+	&driver_attr_bind_mode.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(serio_driver);
- 
- static int serio_driver_probe(struct device *dev)
- {
-@@ -996,7 +997,7 @@ EXPORT_SYMBOL(serio_interrupt);
- static struct bus_type serio_bus = {
- 	.name		= "serio",
- 	.dev_attrs	= serio_device_attrs,
--	.drv_attrs	= serio_driver_attrs,
-+	.drv_groups	= serio_driver_groups,
- 	.match		= serio_bus_match,
- 	.uevent		= serio_uevent,
- 	.probe		= serio_driver_probe,
diff --git a/mei-convert-bus-code-to-use-dev_groups.patch b/mei-convert-bus-code-to-use-dev_groups.patch
deleted file mode 100644
index 64daf8e7e28d43..00000000000000
--- a/mei-convert-bus-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Fri Aug 23 14:15:28 PDT 2013
-Date: Fri, 23 Aug 2013 14:15:28 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: MEI: convert bus code to use dev_groups
-
-The dev_attrs field of struct bus_type is going away soon, dev_groups
-should be used instead.  This converts the MEI bus code to use
-the correct field.
-
-Cc: Tomas Winkler <tomas.winkler@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/misc/mei/bus.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/misc/mei/bus.c
-+++ b/drivers/misc/mei/bus.c
-@@ -108,11 +108,13 @@ static ssize_t modalias_show(struct devi
- 
- 	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
- }
-+static DEVICE_ATTR_RO(modalias);
- 
--static struct device_attribute mei_cl_dev_attrs[] = {
--	__ATTR_RO(modalias),
--	__ATTR_NULL,
-+static struct attribute *mei_cl_dev_attrs[] = {
-+	&dev_attr_modalias.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(mei_cl_dev);
- 
- static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
- {
-@@ -124,7 +126,7 @@ static int mei_cl_uevent(struct device *
- 
- static struct bus_type mei_cl_bus_type = {
- 	.name		= "mei",
--	.dev_attrs	= mei_cl_dev_attrs,
-+	.dev_groups	= mei_cl_dev_groups,
- 	.match		= mei_cl_device_match,
- 	.probe		= mei_cl_device_probe,
- 	.remove		= mei_cl_device_remove,
diff --git a/pci-convert-bus-code-to-use-bus_groups.patch b/pci-convert-bus-code-to-use-bus_groups.patch
index 7a3e0478564f9d..98ffc32b58d4c2 100644
--- a/pci-convert-bus-code-to-use-bus_groups.patch
+++ b/pci-convert-bus-code-to-use-bus_groups.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
-@@ -1274,7 +1274,7 @@ struct bus_type pci_bus_type = {
+@@ -1317,7 +1317,7 @@ struct bus_type pci_bus_type = {
  	.remove		= pci_device_remove,
  	.shutdown	= pci_device_shutdown,
  	.dev_attrs	= pci_dev_attrs,
diff --git a/pci-convert-bus-code-to-use-drv_groups.patch b/pci-convert-bus-code-to-use-drv_groups.patch
index c42118ea82447d..dfea6ff49cb6b4 100644
--- a/pci-convert-bus-code-to-use-drv_groups.patch
+++ b/pci-convert-bus-code-to-use-drv_groups.patch
@@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  /**
   * pci_match_id - See if a pci device matches a given pci_id table
-@@ -1275,7 +1278,7 @@ struct bus_type pci_bus_type = {
+@@ -1318,7 +1321,7 @@ struct bus_type pci_bus_type = {
  	.shutdown	= pci_device_shutdown,
  	.dev_attrs	= pci_dev_attrs,
  	.bus_groups	= pci_bus_groups,
diff --git a/pmu_bus-convert-bus-code-to-use-dev_groups.patch b/pmu_bus-convert-bus-code-to-use-dev_groups.patch
index bc7fd399445d97..f15fdf5607977e 100644
--- a/pmu_bus-convert-bus-code-to-use-dev_groups.patch
+++ b/pmu_bus-convert-bus-code-to-use-dev_groups.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -6189,6 +6189,7 @@ type_show(struct device *dev, struct dev
+@@ -6270,6 +6270,7 @@ type_show(struct device *dev, struct dev
  
  	return snprintf(page, PAGE_SIZE-1, "%d\n", pmu->type);
  }
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  static ssize_t
  perf_event_mux_interval_ms_show(struct device *dev,
-@@ -6233,17 +6234,19 @@ perf_event_mux_interval_ms_store(struct
+@@ -6314,17 +6315,19 @@ perf_event_mux_interval_ms_store(struct
  
  	return count;
  }
diff --git a/rbd-convert-bus-code-to-use-bus_groups.patch b/rbd-convert-bus-code-to-use-bus_groups.patch
deleted file mode 100644
index 788c1bf82336dd..00000000000000
--- a/rbd-convert-bus-code-to-use-bus_groups.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From foo@baz Fri Aug 23 13:16:26 PDT 2013
-Date: Fri, 23 Aug 2013 13:16:26 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: rbd: convert bus code to use bus_groups
-
-The bus_attrs field of struct bus_type is going away soon, dev_groups
-should be used instead.  This converts the RBD bus code to use the
-correct field.
-
-Cc: Yehuda Sadeh <yehuda@inktank.com>
-Cc: Sage Weil <sage@inktank.com>
-Cc: Alex Elder <elder@inktank.com>
-Cc: <ceph-devel@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/block/rbd.c |   14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
---- a/drivers/block/rbd.c
-+++ b/drivers/block/rbd.c
-@@ -397,15 +397,19 @@ static ssize_t rbd_remove(struct bus_typ
- static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);
- static void rbd_spec_put(struct rbd_spec *spec);
- 
--static struct bus_attribute rbd_bus_attrs[] = {
--	__ATTR(add, S_IWUSR, NULL, rbd_add),
--	__ATTR(remove, S_IWUSR, NULL, rbd_remove),
--	__ATTR_NULL
-+static BUS_ATTR(add, S_IWUSR, NULL, rbd_add);
-+static BUS_ATTR(remove, S_IWUSR, NULL, rbd_remove);
-+
-+static struct attribute *rbd_bus_attrs[] = {
-+	&bus_attr_add.attr,
-+	&bus_attr_remove.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(rbd_bus);
- 
- static struct bus_type rbd_bus_type = {
- 	.name		= "rbd",
--	.bus_attrs	= rbd_bus_attrs,
-+	.bus_groups	= rbd_bus_groups,
- };
- 
- static void rbd_root_dev_release(struct device *dev)
diff --git a/series b/series
index 2b84502ab047b2..e90c71ff5f5370 100644
--- a/series
+++ b/series
@@ -17,32 +17,25 @@ serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch
 video-output-convert-class-code-to-use-dev_groups.patch
 
 
-driver-core-remove-dev_attrs-from-struct-class.patch
-driver-core-remove-dev_bin_attrs-from-struct-class.patch
-
 
 0001-Simulate-fake-Fn-key-on-PS-2-keyboards-w-o-one-eg.-C.patch
 
 
 #gregkh/gkh-version.patch
 
-usb-serial-move-the-simple-drivers-into.patch
 
 pci-convert-bus-code-to-use-bus_groups.patch
-rbd-convert-bus-code-to-use-bus_groups.patch
 rapidio-convert-bus-code-to-use-bus_groups.patch
 ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch
 ppc-vio-convert-bus-code-to-use-bus_groups.patch
 scsi-fcoe-convert-bus-code-to-use-bus_groups.patch
-input-gameport-convert-bus-code-to-use-drv_groups.patch
-input-serio-convert-bus-code-to-use-drv_groups.patch
 pci-convert-bus-code-to-use-drv_groups.patch
-usb-serial-convert-bus-code-to-use-drv_groups.patch
-driver-core-platform-convert-bus-code-to-use-dev_groups.patch
-hid-convert-bus-code-to-use-dev_groups.patch
-mei-convert-bus-code-to-use-dev_groups.patch
 pmu_bus-convert-bus-code-to-use-dev_groups.patch
-workqueue-convert-bus-code-to-use-dev_groups.patch
+
+
+driver-core-remove-dev_attrs-from-struct-class.patch
+driver-core-remove-dev_bin_attrs-from-struct-class.patch
+
 
 driver-core-remove-struct-bus_type.bus_attrs.patch
 driver-core-remove-struct-bus_type.drv_attrs.patch
diff --git a/usb-serial-convert-bus-code-to-use-drv_groups.patch b/usb-serial-convert-bus-code-to-use-drv_groups.patch
deleted file mode 100644
index 98647aa6092686..00000000000000
--- a/usb-serial-convert-bus-code-to-use-drv_groups.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From foo@baz Fri Aug 23 13:58:06 PDT 2013
-Date: Fri, 23 Aug 2013 13:58:06 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: serial: convert bus code to use drv_groups
-
-The drv_attrs field of struct bus_type is going away soon, drv_groups
-should be used instead.  This converts the USB serial bus code to use
-the correct field.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/serial/bus.c |   14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
---- a/drivers/usb/serial/bus.c
-+++ b/drivers/usb/serial/bus.c
-@@ -122,7 +122,7 @@ static int usb_serial_device_remove(stru
- 	return retval;
- }
- 
--static ssize_t store_new_id(struct device_driver *driver,
-+static ssize_t new_id_store(struct device_driver *driver,
- 			    const char *buf, size_t count)
- {
- 	struct usb_serial_driver *usb_drv = to_usb_serial_driver(driver);
-@@ -135,17 +135,19 @@ static ssize_t store_new_id(struct devic
- 	return retval;
- }
- 
--static ssize_t show_dynids(struct device_driver *driver, char *buf)
-+static ssize_t new_id_show(struct device_driver *driver, char *buf)
- {
- 	struct usb_serial_driver *usb_drv = to_usb_serial_driver(driver);
- 
- 	return usb_show_dynids(&usb_drv->dynids, buf);
- }
-+static DRIVER_ATTR_RW(new_id);
- 
--static struct driver_attribute drv_attrs[] = {
--	__ATTR(new_id, S_IRUGO | S_IWUSR, show_dynids, store_new_id),
--	__ATTR_NULL,
-+static struct attribute *usb_serial_drv_attrs[] = {
-+	&driver_attr_new_id.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(usb_serial_drv);
- 
- static void free_dynids(struct usb_serial_driver *drv)
- {
-@@ -164,7 +166,7 @@ struct bus_type usb_serial_bus_type = {
- 	.match =	usb_serial_device_match,
- 	.probe =	usb_serial_device_probe,
- 	.remove =	usb_serial_device_remove,
--	.drv_attrs = 	drv_attrs,
-+	.drv_groups = 	usb_serial_drv_groups,
- };
- 
- int usb_serial_bus_register(struct usb_serial_driver *driver)
diff --git a/usb-serial-move-the-simple-drivers-into.patch b/usb-serial-move-the-simple-drivers-into.patch
deleted file mode 100644
index c7285a1c0ed236..00000000000000
--- a/usb-serial-move-the-simple-drivers-into.patch
+++ /dev/null
@@ -1,700 +0,0 @@
-From fdd54c99e4b2754a97a4dafe238191e92bc6f148 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Mon, 5 Aug 2013 19:27:19 +0800
-Subject: [PATCH] USB: serial: move the "simple" drivers into usb-serial-simple.c
-
-Instead of having to create a new driver for a "simple" usb to serial
-device, mush them all into one file, with a macro, so as to make it easy
-to add new ones.
-
-Cc: "René Bürgel" <rene.buergel@sohard.de>
-Acked-by: Wei Shuai <cpuwolf@gmail.com>
-Cc: Josh Triplett <josh@joshtriplett.org>
-Acked-by: Frans Klaver <frans.klaver@xsens.com>
-Cc: "Wesley W. Terpstra" <w.terpstra@gsi.de>
-Cc: Johan Hovold <jhovold@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/Kconfig             |   84 +++++--------------------
- drivers/usb/serial/Makefile            |    9 --
- drivers/usb/serial/flashloader.c       |   39 -----------
- drivers/usb/serial/funsoft.c           |   40 ------------
- drivers/usb/serial/hp4x.c              |   51 ---------------
- drivers/usb/serial/moto_modem.c        |   48 --------------
- drivers/usb/serial/siemens_mpi.c       |   47 --------------
- drivers/usb/serial/suunto.c            |   41 ------------
- drivers/usb/serial/usb-serial-simple.c |  110 +++++++++++++++++++++++++++++++++
- drivers/usb/serial/vivopay-serial.c    |   43 ------------
- drivers/usb/serial/zio.c               |   39 -----------
- 11 files changed, 129 insertions(+), 422 deletions(-)
-
---- a/drivers/usb/serial/Kconfig
-+++ b/drivers/usb/serial/Kconfig
-@@ -51,6 +51,24 @@ config USB_SERIAL_GENERIC
- 	  support" be compiled as a module for this driver to be used
- 	  properly.
- 
-+config USB_SERIAL_SIMPLE
-+	tristate "USB Serial Simple Driver"
-+	help
-+	  Say Y here to use the USB serial "simple" driver.  This driver
-+	  handles a wide range of very simple devices, all in one
-+	  driver.  Specifically, it supports:
-+		- Suunto ANT+ USB device.
-+		- Fundamental Software dongle.
-+		- HP4x calculators
-+		- a number of Motoroloa phones
-+		- Siemens USB/MPI adapter.
-+		- ViVOtech ViVOpay USB device.
-+		- Infineon Modem Flashloader USB interface
-+		- ZIO Motherboard USB serial interface
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called usb-serial-simple.
-+
- config USB_SERIAL_AIRCABLE
- 	tristate "USB AIRcable Bluetooth Dongle Driver"
- 	help
-@@ -158,14 +176,6 @@ config USB_SERIAL_FTDI_SIO
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ftdi_sio.
- 
--config USB_SERIAL_FUNSOFT
--	tristate "USB Fundamental Software Dongle Driver"
--	---help---
--	  Say Y here if you want to use the Fundamental Software dongle.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called funsoft.
--
- config USB_SERIAL_VISOR
- 	tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver"
- 	help
-@@ -462,15 +472,6 @@ config USB_SERIAL_MOS7840
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called mos7840.  If unsure, choose N.
- 
--config USB_SERIAL_MOTOROLA
--	tristate "USB Motorola Phone modem driver"
--	---help---
--	  Say Y here if you want to use a Motorola phone with a USB
--	  connector as a modem link.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called moto_modem.  If unsure, choose N.
--
- config USB_SERIAL_NAVMAN
- 	tristate "USB Navman GPS device"
- 	help
-@@ -525,14 +526,6 @@ config USB_SERIAL_SPCP8X5
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called spcp8x5.
- 
--config USB_SERIAL_HP4X
--        tristate "USB HP4x Calculators support"
--        help
--          Say Y here if you want to use an Hewlett-Packard 4x Calculator.
--
--          To compile this driver as a module, choose M here: the
--          module will be called hp4x.
--
- config USB_SERIAL_SAFE
- 	tristate "USB Safe Serial (Encapsulated) Driver"
- 
-@@ -540,14 +533,6 @@ config USB_SERIAL_SAFE_PADDED
- 	bool "USB Secure Encapsulated Driver - Padded"
- 	depends on USB_SERIAL_SAFE
- 
--config USB_SERIAL_SIEMENS_MPI
--	tristate "USB Siemens MPI driver"
--	help
--	  Say M here if you want to use a Siemens USB/MPI adapter.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called siemens_mpi.
--
- config USB_SERIAL_SIERRAWIRELESS
- 	tristate "USB Sierra Wireless Driver"
- 	help
-@@ -639,14 +624,6 @@ config USB_SERIAL_OPTICON
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called opticon.
- 
--config USB_SERIAL_VIVOPAY_SERIAL
--        tristate "USB ViVOpay serial interface driver"
--        help
--          Say Y here if you want to use a ViVOtech ViVOpay USB device.
--
--          To compile this driver as a module, choose M here: the
--          module will be called vivopay-serial.
--
- config USB_SERIAL_XSENS_MT
- 	tristate "Xsens motion tracker serial interface driver"
- 	help
-@@ -659,14 +636,6 @@ config USB_SERIAL_XSENS_MT
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called xsens_mt.
- 
--config USB_SERIAL_ZIO
--	tristate "ZIO Motherboard USB serial interface driver"
--	help
--	  Say Y here if you want to use ZIO Motherboard.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called zio.
--
- config USB_SERIAL_WISHBONE
- 	tristate "USB-Wishbone adapter interface driver"
- 	help
-@@ -710,23 +679,6 @@ config USB_SERIAL_QT2
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called quatech-serial.
- 
--config USB_SERIAL_FLASHLOADER
--	tristate "Infineon Modem Flashloader USB interface driver"
--	help
--	  Say Y here if you want to download Infineon Modem
--	  via USB Flashloader serial driver.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called flashloader.
--
--config USB_SERIAL_SUUNTO
--	tristate "USB Suunto ANT+ driver"
--	help
--	  Say Y here if you want to use the Suunto ANT+ USB device.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called suunto.
--
- config USB_SERIAL_DEBUG
- 	tristate "USB Debugging Device"
- 	help
---- a/drivers/usb/serial/Makefile
-+++ b/drivers/usb/serial/Makefile
-@@ -24,9 +24,7 @@ obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI)		+=
- obj-$(CONFIG_USB_SERIAL_EMPEG)			+= empeg.o
- obj-$(CONFIG_USB_SERIAL_F81232)			+= f81232.o
- obj-$(CONFIG_USB_SERIAL_FTDI_SIO)		+= ftdi_sio.o
--obj-$(CONFIG_USB_SERIAL_FUNSOFT)		+= funsoft.o
- obj-$(CONFIG_USB_SERIAL_GARMIN)			+= garmin_gps.o
--obj-$(CONFIG_USB_SERIAL_HP4X)			+= hp4x.o
- obj-$(CONFIG_USB_SERIAL_IPAQ)			+= ipaq.o
- obj-$(CONFIG_USB_SERIAL_IPW)			+= ipw.o
- obj-$(CONFIG_USB_SERIAL_IR)			+= ir-usb.o
-@@ -39,7 +37,6 @@ obj-$(CONFIG_USB_SERIAL_MCT_U232)		+= mc
- obj-$(CONFIG_USB_SERIAL_METRO)			+= metro-usb.o
- obj-$(CONFIG_USB_SERIAL_MOS7720)		+= mos7720.o
- obj-$(CONFIG_USB_SERIAL_MOS7840)		+= mos7840.o
--obj-$(CONFIG_USB_SERIAL_MOTOROLA)		+= moto_modem.o
- obj-$(CONFIG_USB_SERIAL_NAVMAN)			+= navman.o
- obj-$(CONFIG_USB_SERIAL_OMNINET)		+= omninet.o
- obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opticon.o
-@@ -50,11 +47,10 @@ obj-$(CONFIG_USB_SERIAL_QCAUX)			+= qcau
- obj-$(CONFIG_USB_SERIAL_QUALCOMM)		+= qcserial.o
- obj-$(CONFIG_USB_SERIAL_QT2)			+= quatech2.o
- obj-$(CONFIG_USB_SERIAL_SAFE)			+= safe_serial.o
--obj-$(CONFIG_USB_SERIAL_SIEMENS_MPI)		+= siemens_mpi.o
- obj-$(CONFIG_USB_SERIAL_SIERRAWIRELESS)		+= sierra.o
-+obj-$(CONFIG_USB_SERIAL_SIMPLE)			+= usb-serial-simple.o
- obj-$(CONFIG_USB_SERIAL_SPCP8X5)		+= spcp8x5.o
- obj-$(CONFIG_USB_SERIAL_SSU100)			+= ssu100.o
--obj-$(CONFIG_USB_SERIAL_SUUNTO)			+= suunto.o
- obj-$(CONFIG_USB_SERIAL_SYMBOL)			+= symbolserial.o
- obj-$(CONFIG_USB_SERIAL_WWAN)			+= usb_wwan.o
- obj-$(CONFIG_USB_SERIAL_TI)			+= ti_usb_3410_5052.o
-@@ -62,8 +58,5 @@ obj-$(CONFIG_USB_SERIAL_VISOR)			+= viso
- obj-$(CONFIG_USB_SERIAL_WISHBONE)		+= wishbone-serial.o
- obj-$(CONFIG_USB_SERIAL_WHITEHEAT)		+= whiteheat.o
- obj-$(CONFIG_USB_SERIAL_XIRCOM)			+= keyspan_pda.o
--obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL)		+= vivopay-serial.o
- obj-$(CONFIG_USB_SERIAL_XSENS_MT)		+= xsens_mt.o
--obj-$(CONFIG_USB_SERIAL_ZIO)			+= zio.o
- obj-$(CONFIG_USB_SERIAL_ZTE)			+= zte_ev.o
--obj-$(CONFIG_USB_SERIAL_FLASHLOADER)		+= flashloader.o
---- a/drivers/usb/serial/flashloader.c
-+++ /dev/null
-@@ -1,39 +0,0 @@
--/*
-- * Infineon Flashloader driver
-- *
-- * Copyright (C) 2013 Wei Shuai <cpuwolf@gmail.com>
-- *
-- *	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/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--#include <linux/uaccess.h>
--
--static const struct usb_device_id id_table[] = {
--	{ USB_DEVICE(0x8087, 0x0716) },
--	{ },
--};
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver flashloader_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"flashloader",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&flashloader_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/funsoft.c
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/*
-- * Funsoft Serial USB driver
-- *
-- * Copyright (C) 2006 Greg Kroah-Hartman <gregkh@suse.de>
-- *
-- *	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/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--#include <linux/uaccess.h>
--
--static const struct usb_device_id id_table[] = {
--	{ USB_DEVICE(0x1404, 0xcddc) },
--	{ },
--};
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver funsoft_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"funsoft",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&funsoft_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--
--MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/hp4x.c
-+++ /dev/null
-@@ -1,51 +0,0 @@
--/*
-- * HP4x Calculators Serial USB driver
-- *
-- * Copyright (C) 2005 Arthur Huillet (ahuillet@users.sf.net)
-- * Copyright (C) 2001-2005 Greg Kroah-Hartman (greg@kroah.com)
-- *
-- *	This program is free software; you can redistribute it and/or modify
-- *	it under the terms of the GNU General Public License as published by
-- *	the Free Software Foundation; either version 2 of the License, or
-- *	(at your option) any later version.
-- *
-- * See Documentation/usb/usb-serial.txt for more information on using this
-- * driver
-- */
--
--#include <linux/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--
--#define DRIVER_DESC "HP4x (48/49) Generic Serial driver"
--
--#define HP_VENDOR_ID 0x03f0
--#define HP49GP_PRODUCT_ID 0x0121
--
--static const struct usb_device_id id_table[] = {
--	{ USB_DEVICE(HP_VENDOR_ID, HP49GP_PRODUCT_ID) },
--	{ }					/* Terminating entry */
--};
--
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver hp49gp_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"hp4X",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&hp49gp_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--
--MODULE_DESCRIPTION(DRIVER_DESC);
--MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/moto_modem.c
-+++ /dev/null
-@@ -1,48 +0,0 @@
--/*
-- * Motorola USB Phone driver
-- *
-- * Copyright (C) 2008 Greg Kroah-Hartman <greg@kroah.com>
-- *
-- *  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.
-- *
-- * {sigh}
-- * Motorola should be using the CDC ACM USB spec, but instead
-- * they try to just "do their own thing"...  This driver should handle a
-- * few phones in which a basic "dumb serial connection" is needed to be
-- * able to get a connection through to them.
-- */
--
--#include <linux/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--
--static const struct usb_device_id id_table[] = {
--	{ USB_DEVICE(0x05c6, 0x3197) },	/* unknown Motorola phone */
--	{ USB_DEVICE(0x0c44, 0x0022) },	/* unknown Mororola phone */
--	{ USB_DEVICE(0x22b8, 0x2a64) },	/* Motorola KRZR K1m */
--	{ USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */
--	{ USB_DEVICE(0x22b8, 0x2c64) }, /* Motorola V950 phone */
--	{ },
--};
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver moto_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"moto-modem",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&moto_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/siemens_mpi.c
-+++ /dev/null
-@@ -1,47 +0,0 @@
--/*
-- * Siemens USB-MPI Serial USB driver
-- *
-- * Copyright (C) 2005 Thomas Hergenhahn <thomas.hergenhahn@suse.de>
-- * Copyright (C) 2005,2008 Greg Kroah-Hartman <gregkh@suse.de>
-- *
-- *	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/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--
--#define DRIVER_AUTHOR "Thomas Hergenhahn@web.de http://libnodave.sf.net"
--#define DRIVER_DESC "Driver for Siemens USB/MPI adapter"
--
--
--static const struct usb_device_id id_table[] = {
--	/* Vendor and product id for 6ES7-972-0CB20-0XA0 */
--	{ USB_DEVICE(0x908, 0x0004) },
--	{ },
--};
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver siemens_usb_mpi_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"siemens_mpi",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&siemens_usb_mpi_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--
--MODULE_AUTHOR(DRIVER_AUTHOR);
--MODULE_DESCRIPTION(DRIVER_DESC);
--MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/suunto.c
-+++ /dev/null
-@@ -1,41 +0,0 @@
--/*
-- * Suunto ANT+ USB Driver
-- *
-- * Copyright (C) 2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-- * Copyright (C) 2013 Linux Foundation
-- *
-- * 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 only.
-- */
--
--#include <linux/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--#include <linux/uaccess.h>
--
--static const struct usb_device_id id_table[] = {
--	{ USB_DEVICE(0x0fcf, 0x1008) },
--	{ },
--};
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver suunto_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		KBUILD_MODNAME,
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&suunto_device,
--	NULL,
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/usb/serial/usb-serial-simple.c
-@@ -0,0 +1,110 @@
-+/*
-+ * USB Serial "Simple" driver
-+ *
-+ * Copyright (C) 2001-2006,2008,2013 Greg Kroah-Hartman <greg@kroah.com>
-+ * Copyright (C) 2005 Arthur Huillet (ahuillet@users.sf.net)
-+ * Copyright (C) 2005 Thomas Hergenhahn <thomas.hergenhahn@suse.de>
-+ * Copyright (C) 2009 Outpost Embedded, LLC
-+ * Copyright (C) 2010 Zilogic Systems <code@zilogic.com>
-+ * Copyright (C) 2013 Wei Shuai <cpuwolf@gmail.com>
-+ * Copyright (C) 2013 Linux Foundation
-+ *
-+ *	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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/tty.h>
-+#include <linux/module.h>
-+#include <linux/usb.h>
-+#include <linux/usb/serial.h>
-+
-+#define DEVICE(vendor, IDS)					\
-+static const struct usb_device_id vendor##_id_table[] = {	\
-+	IDS(),							\
-+	{ },							\
-+};								\
-+static struct usb_serial_driver vendor##_device = {		\
-+	.driver = {						\
-+		.owner =	THIS_MODULE,			\
-+		.name =		"stringify(vendor)",		\
-+	},							\
-+	.id_table =		vendor##_id_table,		\
-+	.num_ports =		1,				\
-+};
-+
-+
-+/* ZIO Motherboard USB driver */
-+#define ZIO_IDS()			\
-+	{ USB_DEVICE(0x1CBE, 0x0103) }
-+DEVICE(zio, ZIO_IDS);
-+
-+/* Funsoft Serial USB driver */
-+#define FUNSOFT_IDS()			\
-+	{ USB_DEVICE(0x1404, 0xcddc) }
-+DEVICE(funsoft, FUNSOFT_IDS);
-+
-+/* Infineon Flashloader driver */
-+#define FLASHLOADER_IDS()		\
-+	{ USB_DEVICE(0x8087, 0x0716) }
-+DEVICE(flashloader, FLASHLOADER_IDS);
-+
-+/* ViVOpay USB Serial Driver */
-+#define VIVOPAY_IDS()			\
-+	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
-+DEVICE(vivopay, VIVOPAY_IDS);
-+
-+/* Motorola USB Phone driver */
-+#define MOTO_IDS()			\
-+	{ USB_DEVICE(0x05c6, 0x3197) },	/* unknown Motorola phone */	\
-+	{ USB_DEVICE(0x0c44, 0x0022) },	/* unknown Mororola phone */	\
-+	{ USB_DEVICE(0x22b8, 0x2a64) },	/* Motorola KRZR K1m */		\
-+	{ USB_DEVICE(0x22b8, 0x2c84) },	/* Motorola VE240 phone */	\
-+	{ USB_DEVICE(0x22b8, 0x2c64) }	/* Motorola V950 phone */
-+DEVICE(moto_modem, MOTO_IDS);
-+
-+/* HP4x (48/49) Generic Serial driver */
-+#define HP4X_IDS()			\
-+	{ USB_DEVICE(0x03f0, 0x0121) }
-+DEVICE(hp4x, HP4X_IDS);
-+
-+/* Suunto ANT+ USB Driver */
-+#define SUUNTO_IDS()			\
-+	{ USB_DEVICE(0x0fcf, 0x1008) }
-+DEVICE(suunto, SUUNTO_IDS);
-+
-+/* Siemens USB/MPI adapter */
-+#define SIEMENS_IDS()			\
-+	{ USB_DEVICE(0x908, 0x0004) }
-+DEVICE(siemens_mpi, SIEMENS_IDS);
-+
-+/* All of the above structures mushed into two lists */
-+static struct usb_serial_driver * const serial_drivers[] = {
-+	&zio_device,
-+	&funsoft_device,
-+	&flashloader_device,
-+	&vivopay_device,
-+	&moto_modem_device,
-+	&hp4x_device,
-+	&suunto_device,
-+	&siemens_mpi_device,
-+	NULL
-+};
-+
-+static const struct usb_device_id id_table[] = {
-+	ZIO_IDS(),
-+	FUNSOFT_IDS(),
-+	FLASHLOADER_IDS(),
-+	VIVOPAY_IDS(),
-+	MOTO_IDS(),
-+	HP4X_IDS(),
-+	SUUNTO_IDS(),
-+	SIEMENS_IDS(),
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(usb, id_table);
-+
-+module_usb_serial_driver(serial_drivers, id_table);
-+MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/vivopay-serial.c
-+++ /dev/null
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2001-2005 Greg Kroah-Hartman (greg@kroah.com)
-- * Copyright (C) 2009 Outpost Embedded, LLC
-- */
--
--#include <linux/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--
--#define DRIVER_DESC "ViVOpay USB Serial Driver"
--
--#define VIVOPAY_VENDOR_ID 0x1d5f
--
--
--static struct usb_device_id id_table [] = {
--	/* ViVOpay 8800 */
--	{ USB_DEVICE(VIVOPAY_VENDOR_ID, 0x1004) },
--	{ },
--};
--
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver vivopay_serial_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"vivopay-serial",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&vivopay_serial_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--
--MODULE_AUTHOR("Forest Bond <forest.bond@outpostembedded.com>");
--MODULE_DESCRIPTION(DRIVER_DESC);
--MODULE_LICENSE("GPL");
---- a/drivers/usb/serial/zio.c
-+++ /dev/null
-@@ -1,39 +0,0 @@
--/*
-- * ZIO Motherboard USB driver
-- *
-- * Copyright (C) 2010 Zilogic Systems <code@zilogic.com>
-- *
-- *	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/kernel.h>
--#include <linux/init.h>
--#include <linux/tty.h>
--#include <linux/module.h>
--#include <linux/usb.h>
--#include <linux/usb/serial.h>
--#include <linux/uaccess.h>
--
--static const struct usb_device_id id_table[] = {
--	{ USB_DEVICE(0x1CBE, 0x0103) },
--	{ },
--};
--MODULE_DEVICE_TABLE(usb, id_table);
--
--static struct usb_serial_driver zio_device = {
--	.driver = {
--		.owner =	THIS_MODULE,
--		.name =		"zio",
--	},
--	.id_table =		id_table,
--	.num_ports =		1,
--};
--
--static struct usb_serial_driver * const serial_drivers[] = {
--	&zio_device, NULL
--};
--
--module_usb_serial_driver(serial_drivers, id_table);
--MODULE_LICENSE("GPL");
diff --git a/workqueue-convert-bus-code-to-use-dev_groups.patch b/workqueue-convert-bus-code-to-use-dev_groups.patch
deleted file mode 100644
index 0f36ed6cda5c9a..00000000000000
--- a/workqueue-convert-bus-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From foo@baz Fri Aug 23 14:18:12 PDT 2013
-Date: Fri, 23 Aug 2013 14:18:12 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: workqueue: convert bus code to use dev_groups
-
-The dev_attrs field of struct bus_type is going away soon, dev_groups
-should be used instead.  This converts the workqueue bus code to use
-the correct field.
-
-Cc: Tejun Heo <tj@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- kernel/workqueue.c |   27 +++++++++++++++------------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -3095,25 +3095,26 @@ static struct workqueue_struct *dev_to_w
- 	return wq_dev->wq;
- }
- 
--static ssize_t wq_per_cpu_show(struct device *dev,
--			       struct device_attribute *attr, char *buf)
-+static ssize_t per_cpu_show(struct device *dev, struct device_attribute *attr,
-+			    char *buf)
- {
- 	struct workqueue_struct *wq = dev_to_wq(dev);
- 
- 	return scnprintf(buf, PAGE_SIZE, "%d\n", (bool)!(wq->flags & WQ_UNBOUND));
- }
-+static DEVICE_ATTR_RO(per_cpu);
- 
--static ssize_t wq_max_active_show(struct device *dev,
--				  struct device_attribute *attr, char *buf)
-+static ssize_t max_active_show(struct device *dev,
-+			       struct device_attribute *attr, char *buf)
- {
- 	struct workqueue_struct *wq = dev_to_wq(dev);
- 
- 	return scnprintf(buf, PAGE_SIZE, "%d\n", wq->saved_max_active);
- }
- 
--static ssize_t wq_max_active_store(struct device *dev,
--				   struct device_attribute *attr,
--				   const char *buf, size_t count)
-+static ssize_t max_active_store(struct device *dev,
-+				struct device_attribute *attr, const char *buf,
-+				size_t count)
- {
- 	struct workqueue_struct *wq = dev_to_wq(dev);
- 	int val;
-@@ -3124,12 +3125,14 @@ static ssize_t wq_max_active_store(struc
- 	workqueue_set_max_active(wq, val);
- 	return count;
- }
-+static DEVICE_ATTR_RW(max_active);
- 
--static struct device_attribute wq_sysfs_attrs[] = {
--	__ATTR(per_cpu, 0444, wq_per_cpu_show, NULL),
--	__ATTR(max_active, 0644, wq_max_active_show, wq_max_active_store),
--	__ATTR_NULL,
-+static struct attribute *wq_sysfs_attrs[] = {
-+	&dev_attr_per_cpu.attr,
-+	&dev_attr_max_active.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(wq_sysfs);
- 
- static ssize_t wq_pool_ids_show(struct device *dev,
- 				struct device_attribute *attr, char *buf)
-@@ -3279,7 +3282,7 @@ static struct device_attribute wq_sysfs_
- 
- static struct bus_type wq_subsys = {
- 	.name				= "workqueue",
--	.dev_attrs			= wq_sysfs_attrs,
-+	.dev_groups			= wq_sysfs_groups,
- };
- 
- static int __init wq_sysfs_init(void)