23 files changed, 74 insertions, 1249 deletions
diff --git a/0001-drbd-rename-usermode_helper-to-drbd_usermode_helper.patch b/0001-drbd-rename-usermode_helper-to-drbd_usermode_helper.patch
deleted file mode 100644
index 196f4d4288472c..00000000000000
--- a/0001-drbd-rename-usermode_helper-to-drbd_usermode_helper.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From e901adf909be0a529d4f05cd6492f1347046cf59 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Sun, 11 Dec 2016 10:39:09 +0100
-Subject: [PATCH 1/3] drbd: rename "usermode_helper" to "drbd_usermode_helper"
-
-Nothing like having a very generic global variable in a tiny driver
-subsystem to make a mess of the global namespace...
-
-Note, there are many other "generic" named global variables in the drbd
-subsystem, someone should fix those up one day before they hit a linking
-error.
-
-Cc: Philipp Reisner <philipp.reisner@linbit.com>
-Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/block/drbd/drbd_int.h  |    2 +-
- drivers/block/drbd/drbd_main.c |    4 ++--
- drivers/block/drbd/drbd_nl.c   |   20 ++++++++++----------
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
---- a/drivers/block/drbd/drbd_int.h
-+++ b/drivers/block/drbd/drbd_int.h
-@@ -75,7 +75,7 @@ extern int fault_rate;
- extern int fault_devs;
- #endif
- 
--extern char usermode_helper[];
-+extern char drbd_usermode_helper[];
- 
- 
- /* This is used to stop/restart our threads.
---- a/drivers/block/drbd/drbd_main.c
-+++ b/drivers/block/drbd/drbd_main.c
-@@ -109,9 +109,9 @@ int proc_details;       /* Detail level
- 
- /* Module parameter for setting the user mode helper program
-  * to run. Default is /sbin/drbdadm */
--char usermode_helper[80] = "/sbin/drbdadm";
-+char drbd_usermode_helper[80] = "/sbin/drbdadm";
- 
--module_param_string(usermode_helper, usermode_helper, sizeof(usermode_helper), 0644);
-+module_param_string(usermode_helper, drbd_usermode_helper, sizeof(drbd_usermode_helper), 0644);
- 
- /* in 2.6.x, our device mapping and config info contains our virtual gendisks
-  * as member "struct gendisk *vdisk;"
---- a/drivers/block/drbd/drbd_nl.c
-+++ b/drivers/block/drbd/drbd_nl.c
-@@ -344,7 +344,7 @@ int drbd_khelper(struct drbd_device *dev
- 			 (char[60]) { }, /* address */
- 			NULL };
- 	char mb[14];
--	char *argv[] = {usermode_helper, cmd, mb, NULL };
-+	char *argv[] = {drbd_usermode_helper, cmd, mb, NULL };
- 	struct drbd_connection *connection = first_peer_device(device)->connection;
- 	struct sib_info sib;
- 	int ret;
-@@ -359,19 +359,19 @@ int drbd_khelper(struct drbd_device *dev
- 	 * write out any unsynced meta data changes now */
- 	drbd_md_sync(device);
- 
--	drbd_info(device, "helper command: %s %s %s\n", usermode_helper, cmd, mb);
-+	drbd_info(device, "helper command: %s %s %s\n", drbd_usermode_helper, cmd, mb);
- 	sib.sib_reason = SIB_HELPER_PRE;
- 	sib.helper_name = cmd;
- 	drbd_bcast_event(device, &sib);
- 	notify_helper(NOTIFY_CALL, device, connection, cmd, 0);
--	ret = call_usermodehelper(usermode_helper, argv, envp, UMH_WAIT_PROC);
-+	ret = call_usermodehelper(drbd_usermode_helper, argv, envp, UMH_WAIT_PROC);
- 	if (ret)
- 		drbd_warn(device, "helper command: %s %s %s exit code %u (0x%x)\n",
--				usermode_helper, cmd, mb,
-+				drbd_usermode_helper, cmd, mb,
- 				(ret >> 8) & 0xff, ret);
- 	else
- 		drbd_info(device, "helper command: %s %s %s exit code %u (0x%x)\n",
--				usermode_helper, cmd, mb,
-+				drbd_usermode_helper, cmd, mb,
- 				(ret >> 8) & 0xff, ret);
- 	sib.sib_reason = SIB_HELPER_POST;
- 	sib.helper_exit_code = ret;
-@@ -396,24 +396,24 @@ enum drbd_peer_state conn_khelper(struct
- 			 (char[60]) { }, /* address */
- 			NULL };
- 	char *resource_name = connection->resource->name;
--	char *argv[] = {usermode_helper, cmd, resource_name, NULL };
-+	char *argv[] = {drbd_usermode_helper, cmd, resource_name, NULL };
- 	int ret;
- 
- 	setup_khelper_env(connection, envp);
- 	conn_md_sync(connection);
- 
--	drbd_info(connection, "helper command: %s %s %s\n", usermode_helper, cmd, resource_name);
-+	drbd_info(connection, "helper command: %s %s %s\n", drbd_usermode_helper, cmd, resource_name);
- 	/* TODO: conn_bcast_event() ?? */
- 	notify_helper(NOTIFY_CALL, NULL, connection, cmd, 0);
- 
--	ret = call_usermodehelper(usermode_helper, argv, envp, UMH_WAIT_PROC);
-+	ret = call_usermodehelper(drbd_usermode_helper, argv, envp, UMH_WAIT_PROC);
- 	if (ret)
- 		drbd_warn(connection, "helper command: %s %s %s exit code %u (0x%x)\n",
--			  usermode_helper, cmd, resource_name,
-+			  drbd_usermode_helper, cmd, resource_name,
- 			  (ret >> 8) & 0xff, ret);
- 	else
- 		drbd_info(connection, "helper command: %s %s %s exit code %u (0x%x)\n",
--			  usermode_helper, cmd, resource_name,
-+			  drbd_usermode_helper, cmd, resource_name,
- 			  (ret >> 8) & 0xff, ret);
- 	/* TODO: conn_bcast_event() ?? */
- 	notify_helper(NOTIFY_RESPONSE, NULL, connection, cmd, ret);
diff --git a/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch b/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch
index 67a6fa912e94ef..5540af403407aa 100644
--- a/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch
+++ b/0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch
@@ -42,7 +42,7 @@ Signed-off-by: Jin Qian <jinqian@android.com>
 
 --- a/drivers/dma-buf/dma-fence.c
 +++ b/drivers/dma-buf/dma-fence.c
-@@ -334,8 +334,12 @@ dma_fence_remove_callback(struct dma_fen
+@@ -329,8 +329,12 @@ dma_fence_remove_callback(struct dma_fen
  	spin_lock_irqsave(fence->lock, flags);
  
  	ret = !list_empty(&cb->node);
@@ -58,7 +58,7 @@ Signed-off-by: Jin Qian <jinqian@android.com>
  
 --- a/include/linux/dma-fence.h
 +++ b/include/linux/dma-fence.h
-@@ -109,6 +109,7 @@ struct dma_fence_cb {
+@@ -111,6 +111,7 @@ struct dma_fence_cb {
   * @get_driver_name: returns the driver name.
   * @get_timeline_name: return the name of the context this fence belongs to.
   * @enable_signaling: enable software signaling of fence.
@@ -66,7 +66,7 @@ Signed-off-by: Jin Qian <jinqian@android.com>
   * @signaled: [optional] peek whether the fence is signaled, can be null.
   * @wait: custom wait implementation, or dma_fence_default_wait.
   * @release: [optional] called on destruction of fence, can be null
-@@ -168,6 +169,7 @@ struct dma_fence_ops {
+@@ -170,6 +171,7 @@ struct dma_fence_ops {
  	const char * (*get_driver_name)(struct dma_fence *fence);
  	const char * (*get_timeline_name)(struct dma_fence *fence);
  	bool (*enable_signaling)(struct dma_fence *fence);
diff --git a/d01.patch b/d01.patch
new file mode 100644
index 00000000000000..afdf3aa96574ce
--- /dev/null
+++ b/d01.patch
@@ -0,0 +1,46 @@
+From foo@baz Thu Sep 14 23:35:39 PDT 2017
+Date: Thu, 14 Sep 2017 23:35:39 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: fpga: altera-cvp: remove DRIVER_ATTR() usage
+
+It's better to be explicit and use the DRIVER_ATTR_RW() macro when
+defining a driver's sysfs file.
+
+This is part of a series to drop DRIVER_ATTR() from the tree entirely.
+
+Cc: Alan Tull <atull@kernel.org>
+Cc: Moritz Fischer <mdf@kernel.org>
+Cc: linux-fpga@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/fpga/altera-cvp.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/fpga/altera-cvp.c
++++ b/drivers/fpga/altera-cvp.c
+@@ -361,12 +361,12 @@ static const struct fpga_manager_ops alt
+ 	.write_complete	= altera_cvp_write_complete,
+ };
+ 
+-static ssize_t show_chkcfg(struct device_driver *dev, char *buf)
++static ssize_t chkcfg_show(struct device_driver *dev, char *buf)
+ {
+ 	return snprintf(buf, 3, "%d\n", altera_cvp_chkcfg);
+ }
+ 
+-static ssize_t store_chkcfg(struct device_driver *drv, const char *buf,
++static ssize_t chkcfg_store(struct device_driver *drv, const char *buf,
+ 			    size_t count)
+ {
+ 	int ret;
+@@ -378,7 +378,7 @@ static ssize_t store_chkcfg(struct devic
+ 	return count;
+ }
+ 
+-static DRIVER_ATTR(chkcfg, 0600, show_chkcfg, store_chkcfg);
++static DRIVER_ATTR(chkcfg);
+ 
+ static int altera_cvp_probe(struct pci_dev *pdev,
+ 			    const struct pci_device_id *dev_id);
diff --git a/d05.patch b/d05.patch
deleted file mode 100644
index fedee5c089c55e..00000000000000
--- a/d05.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From foo@baz Thu Jun  8 15:03:04 CEST 2017
-Date: Thu, 08 Jun 2017 15:03:04 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: SCSI: remove DRIVER_ATTR() usage
-
-It's better to use the DRIVER_ATTR_RW() and DRIVER_ATTR_RO() macros to
-explicitly show that this is a read/write or read/only sysfs file.  So
-convert the remaining SCSI drivers that use the old style to use the
-newer macros.
-
-Bonus is that this removes some checkpatch.pl warnings :)
-
-This is part of a series to drop DRIVER_ATTR() from the tree entirely.
-
-Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
-Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
-Cc: Kashyap Desai <kashyap.desai@broadcom.com>
-Cc: Sumit Saxena <sumit.saxena@broadcom.com>
-Cc: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
-Cc: Willem Riede <osst@riede.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/aic94xx/aic94xx_init.c       |    4 +--
- drivers/scsi/megaraid/megaraid_sas_base.c |   36 ++++++++++--------------------
- drivers/scsi/osst.c                       |    4 +--
- 3 files changed, 16 insertions(+), 28 deletions(-)
-
---- a/drivers/scsi/aic94xx/aic94xx_init.c
-+++ b/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -956,11 +956,11 @@ static int asd_scan_finished(struct Scsi
- 	return 1;
- }
- 
--static ssize_t asd_version_show(struct device_driver *driver, char *buf)
-+static ssize_t version_show(struct device_driver *driver, char *buf)
- {
- 	return snprintf(buf, PAGE_SIZE, "%s\n", ASD_DRIVER_VERSION);
- }
--static DRIVER_ATTR(version, S_IRUGO, asd_version_show, NULL);
-+static DRIVER_ATTR_RO(version);
- 
- static int asd_create_driver_attrs(struct device_driver *driver)
- {
---- a/drivers/scsi/megaraid/megaraid_sas_base.c
-+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -7323,49 +7323,39 @@ static struct pci_driver megasas_pci_dri
- /*
-  * Sysfs driver attributes
-  */
--static ssize_t megasas_sysfs_show_version(struct device_driver *dd, char *buf)
-+static ssize_t version_show(struct device_driver *dd, char *buf)
- {
- 	return snprintf(buf, strlen(MEGASAS_VERSION) + 2, "%s\n",
- 			MEGASAS_VERSION);
- }
-+static DRIVER_ATTR_RO(version);
- 
--static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL);
--
--static ssize_t
--megasas_sysfs_show_release_date(struct device_driver *dd, char *buf)
-+static ssize_t release_date_show(struct device_driver *dd, char *buf)
- {
- 	return snprintf(buf, strlen(MEGASAS_RELDATE) + 2, "%s\n",
- 		MEGASAS_RELDATE);
- }
-+static DRIVER_ATTR_RO(release_date);
- 
--static DRIVER_ATTR(release_date, S_IRUGO, megasas_sysfs_show_release_date, NULL);
--
--static ssize_t
--megasas_sysfs_show_support_poll_for_event(struct device_driver *dd, char *buf)
-+static ssize_t support_poll_for_event_show(struct device_driver *dd, char *buf)
- {
- 	return sprintf(buf, "%u\n", support_poll_for_event);
- }
-+static DRIVER_ATTR_RO(support_poll_for_event);
- 
--static DRIVER_ATTR(support_poll_for_event, S_IRUGO,
--			megasas_sysfs_show_support_poll_for_event, NULL);
--
-- static ssize_t
--megasas_sysfs_show_support_device_change(struct device_driver *dd, char *buf)
-+static ssize_t support_device_change_show(struct device_driver *dd, char *buf)
- {
- 	return sprintf(buf, "%u\n", support_device_change);
- }
-+static DRIVER_ATTR_RO(support_device_change);
- 
--static DRIVER_ATTR(support_device_change, S_IRUGO,
--			megasas_sysfs_show_support_device_change, NULL);
--
--static ssize_t
--megasas_sysfs_show_dbg_lvl(struct device_driver *dd, char *buf)
-+static ssize_t dbg_lvl_show(struct device_driver *dd, char *buf)
- {
- 	return sprintf(buf, "%u\n", megasas_dbg_lvl);
- }
- 
--static ssize_t
--megasas_sysfs_set_dbg_lvl(struct device_driver *dd, const char *buf, size_t count)
-+static ssize_t dbg_lvl_store(struct device_driver *dd, const char *buf,
-+			     size_t count)
- {
- 	int retval = count;
- 
-@@ -7375,9 +7365,7 @@ megasas_sysfs_set_dbg_lvl(struct device_
- 	}
- 	return retval;
- }
--
--static DRIVER_ATTR(dbg_lvl, S_IRUGO|S_IWUSR, megasas_sysfs_show_dbg_lvl,
--		megasas_sysfs_set_dbg_lvl);
-+static DRIVER_ATTR_RW(dbg_lvl);
- 
- static inline void megasas_remove_scsi_device(struct scsi_device *sdev)
- {
---- a/drivers/scsi/osst.c
-+++ b/drivers/scsi/osst.c
-@@ -5667,12 +5667,12 @@ static	struct	osst_support_data support_
-  * sysfs support for osst driver parameter information
-  */
- 
--static ssize_t osst_version_show(struct device_driver *ddd, char *buf)
-+static ssize_t version_show(struct device_driver *ddd, char *buf)
- {
- 	return snprintf(buf, PAGE_SIZE, "%s\n", osst_version);
- }
- 
--static DRIVER_ATTR(version, S_IRUGO, osst_version_show, NULL);
-+static DRIVER_ATTR_RO(version);
- 
- static int osst_create_sysfs_files(struct device_driver *sysfs)
- {
diff --git a/d13.patch b/d13.patch
deleted file mode 100644
index eddd0c81601e3c..00000000000000
--- a/d13.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From foo@baz Wed Jul 19 14:30:27 CEST 2017
-Date: Wed, 19 Jul 2017 14:30:27 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: fbdev: uvesafb: remove DRIVER_ATTR() usage
-
-It's better to be explicit and use the DRIVER_ATTR_RW() macro when
-defining a driver's sysfs file.  Bonus is this fixes up a checkpatch.pl
-warning.
-
-This is part of a series to drop DRIVER_ATTR() from the tree entirely.
-
-Cc: Michal Januszewski <spock@gentoo.org>
-Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/video/fbdev/uvesafb.c |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/drivers/video/fbdev/uvesafb.c
-+++ b/drivers/video/fbdev/uvesafb.c
-@@ -1860,19 +1860,18 @@ static int uvesafb_setup(char *options)
- }
- #endif /* !MODULE */
- 
--static ssize_t show_v86d(struct device_driver *dev, char *buf)
-+static ssize_t v86d_show(struct device_driver *dev, char *buf)
- {
- 	return snprintf(buf, PAGE_SIZE, "%s\n", v86d_path);
- }
- 
--static ssize_t store_v86d(struct device_driver *dev, const char *buf,
-+static ssize_t v86d_store(struct device_driver *dev, const char *buf,
- 		size_t count)
- {
- 	strncpy(v86d_path, buf, PATH_MAX);
- 	return count;
- }
--
--static DRIVER_ATTR(v86d, S_IRUGO | S_IWUSR, show_v86d, store_v86d);
-+static DRIVER_ATTR_RW(v86d);
- 
- static int uvesafb_init(void)
- {
diff --git a/d14.patch b/d14.patch
deleted file mode 100644
index 6a0e6486f4797a..00000000000000
--- a/d14.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From foo@baz Wed Jul 19 14:32:31 CEST 2017
-Date: Wed, 19 Jul 2017 14:32:31 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: DMA: ppc4xx: remove DRIVER_ATTR() usage
-
-It's better to be explicit and use the DRIVER_ATTR_RW() and
-DRIVER_ATTR_RO() macros when defining a driver's sysfs file.
-
-Bonus is this fixes up a checkpatch.pl warning.
-
-This is part of a series to drop DRIVER_ATTR() from the tree entirely.
-
-Cc: Vinod Koul <vinod.koul@intel.com>
-Cc: Dan Williams <dan.j.williams@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/dma/ppc4xx/adma.c |   23 ++++++++++-------------
- 1 file changed, 10 insertions(+), 13 deletions(-)
-
-
---- a/drivers/dma/ppc4xx/adma.c
-+++ b/drivers/dma/ppc4xx/adma.c
-@@ -4307,7 +4307,7 @@ static int ppc440spe_adma_remove(struct
-  * "poly" allows setting/checking used polynomial (for PPC440SPe only).
-  */
- 
--static ssize_t show_ppc440spe_devices(struct device_driver *dev, char *buf)
-+static ssize_t devices_show(struct device_driver *dev, char *buf)
- {
- 	ssize_t size = 0;
- 	int i;
-@@ -4321,16 +4321,17 @@ static ssize_t show_ppc440spe_devices(st
- 	}
- 	return size;
- }
-+static DRIVER_ATTR_RO(devices);
- 
--static ssize_t show_ppc440spe_r6enable(struct device_driver *dev, char *buf)
-+static ssize_t enable_show(struct device_driver *dev, char *buf)
- {
- 	return snprintf(buf, PAGE_SIZE,
- 			"PPC440SP(e) RAID-6 capabilities are %sABLED.\n",
- 			ppc440spe_r6_enabled ? "EN" : "DIS");
- }
- 
--static ssize_t store_ppc440spe_r6enable(struct device_driver *dev,
--					const char *buf, size_t count)
-+static ssize_t enable_store(struct device_driver *dev, const char *buf,
-+			    size_t count)
- {
- 	unsigned long val;
- 
-@@ -4357,8 +4358,9 @@ static ssize_t store_ppc440spe_r6enable(
- 	}
- 	return count;
- }
-+static DRIVER_ATTR_RW(enable);
- 
--static ssize_t show_ppc440spe_r6poly(struct device_driver *dev, char *buf)
-+static ssize_t poly_store(struct device_driver *dev, char *buf)
- {
- 	ssize_t size = 0;
- 	u32 reg;
-@@ -4377,8 +4379,8 @@ static ssize_t show_ppc440spe_r6poly(str
- 	return size;
- }
- 
--static ssize_t store_ppc440spe_r6poly(struct device_driver *dev,
--				      const char *buf, size_t count)
-+static ssize_t poly_store(struct device_driver *dev, const char *buf,
-+			  size_t count)
- {
- 	unsigned long reg, val;
- 
-@@ -4404,12 +4406,7 @@ static ssize_t store_ppc440spe_r6poly(st
- 
- 	return count;
- }
--
--static DRIVER_ATTR(devices, S_IRUGO, show_ppc440spe_devices, NULL);
--static DRIVER_ATTR(enable, S_IRUGO | S_IWUSR, show_ppc440spe_r6enable,
--		   store_ppc440spe_r6enable);
--static DRIVER_ATTR(poly, S_IRUGO | S_IWUSR, show_ppc440spe_r6poly,
--		   store_ppc440spe_r6poly);
-+static DRIVER_ATTR_RW(poly);
- 
- /*
-  * Common initialisation for RAID engines; allocate memory for
diff --git a/d16.patch b/d16.patch
deleted file mode 100644
index ac0ae5000685cd..00000000000000
--- a/d16.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From foo@baz Wed Jul 19 14:33:41 CEST 2017
-Date: Wed, 19 Jul 2017 14:33:41 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: xen: xen-pciback: remove DRIVER_ATTR() usage
-
-It's better to be explicit and use the DRIVER_ATTR_RW() and
-DRIVER_ATTR_RO() macros when defining a driver's sysfs file.
-
-Bonus is this fixes up a checkpatch.pl warning.
-
-This is part of a series to drop DRIVER_ATTR() from the tree entirely.
-
-Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-Cc: Juergen Gross <jgross@suse.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/xen/xen-pciback/pci_stub.c |   44 ++++++++++++++++---------------------
- 1 file changed, 20 insertions(+), 24 deletions(-)
-
-
---- a/drivers/xen/xen-pciback/pci_stub.c
-+++ b/drivers/xen/xen-pciback/pci_stub.c
-@@ -1172,8 +1172,8 @@ out:
- 	return err;
- }
- 
--static ssize_t pcistub_slot_add(struct device_driver *drv, const char *buf,
--				size_t count)
-+static ssize_t new_slot_store(struct device_driver *drv, const char *buf,
-+			      size_t count)
- {
- 	int domain, bus, slot, func;
- 	int err;
-@@ -1189,10 +1189,10 @@ out:
- 		err = count;
- 	return err;
- }
--static DRIVER_ATTR(new_slot, S_IWUSR, NULL, pcistub_slot_add);
-+static DRIVER_ATTR_WO(new_slot);
- 
--static ssize_t pcistub_slot_remove(struct device_driver *drv, const char *buf,
--				   size_t count)
-+static ssize_t remove_slot_store(struct device_driver *drv, const char *buf,
-+				 size_t count)
- {
- 	int domain, bus, slot, func;
- 	int err;
-@@ -1208,9 +1208,9 @@ out:
- 		err = count;
- 	return err;
- }
--static DRIVER_ATTR(remove_slot, S_IWUSR, NULL, pcistub_slot_remove);
-+static DRIVER_ATTR_WO(remove_slot);
- 
--static ssize_t pcistub_slot_show(struct device_driver *drv, char *buf)
-+static ssize_t slots_show(struct device_driver *drv, char *buf)
- {
- 	struct pcistub_device_id *pci_dev_id;
- 	size_t count = 0;
-@@ -1231,9 +1231,9 @@ static ssize_t pcistub_slot_show(struct
- 
- 	return count;
- }
--static DRIVER_ATTR(slots, S_IRUSR, pcistub_slot_show, NULL);
-+static DRIVER_ATTR_RO(slots);
- 
--static ssize_t pcistub_irq_handler_show(struct device_driver *drv, char *buf)
-+static ssize_t irq_handlers_show(struct device_driver *drv, char *buf)
- {
- 	struct pcistub_device *psdev;
- 	struct xen_pcibk_dev_data *dev_data;
-@@ -1260,11 +1260,10 @@ static ssize_t pcistub_irq_handler_show(
- 	spin_unlock_irqrestore(&pcistub_devices_lock, flags);
- 	return count;
- }
--static DRIVER_ATTR(irq_handlers, S_IRUSR, pcistub_irq_handler_show, NULL);
-+static DRIVER_ATTR_RO(irq_handlers);
- 
--static ssize_t pcistub_irq_handler_switch(struct device_driver *drv,
--					  const char *buf,
--					  size_t count)
-+static ssize_t irq_handler_state_store(struct device_driver *drv,
-+				       const char *buf, size_t count)
- {
- 	struct pcistub_device *psdev;
- 	struct xen_pcibk_dev_data *dev_data;
-@@ -1301,11 +1300,10 @@ out:
- 		err = count;
- 	return err;
- }
--static DRIVER_ATTR(irq_handler_state, S_IWUSR, NULL,
--		   pcistub_irq_handler_switch);
-+static DRIVER_ATTR_WO(irq_handler_state);
- 
--static ssize_t pcistub_quirk_add(struct device_driver *drv, const char *buf,
--				 size_t count)
-+static ssize_t quirks_store(struct device_driver *drv, const char *buf,
-+			    size_t count)
- {
- 	int domain, bus, slot, func, reg, size, mask;
- 	int err;
-@@ -1323,7 +1321,7 @@ out:
- 	return err;
- }
- 
--static ssize_t pcistub_quirk_show(struct device_driver *drv, char *buf)
-+static ssize_t quirks_show(struct device_driver *drv, char *buf)
- {
- 	int count = 0;
- 	unsigned long flags;
-@@ -1366,11 +1364,10 @@ out:
- 
- 	return count;
- }
--static DRIVER_ATTR(quirks, S_IRUSR | S_IWUSR, pcistub_quirk_show,
--		   pcistub_quirk_add);
-+static DRIVER_ATTR_RW(quirks);
- 
--static ssize_t permissive_add(struct device_driver *drv, const char *buf,
--			      size_t count)
-+static ssize_t permissive_store(struct device_driver *drv, const char *buf,
-+				size_t count)
- {
- 	int domain, bus, slot, func;
- 	int err;
-@@ -1431,8 +1428,7 @@ static ssize_t permissive_show(struct de
- 	spin_unlock_irqrestore(&pcistub_devices_lock, flags);
- 	return count;
- }
--static DRIVER_ATTR(permissive, S_IRUSR | S_IWUSR, permissive_show,
--		   permissive_add);
-+static DRIVER_ATTR_RW(permissive);
- 
- static void pcistub_exit(void)
- {
diff --git a/lib-vsprintf-add-pap-padp-options.patch b/lib-vsprintf-add-pap-padp-options.patch
index f33d647d199063..3c2202ceabe737 100644
--- a/lib-vsprintf-add-pap-padp-options.patch
+++ b/lib-vsprintf-add-pap-padp-options.patch
@@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/Documentation/printk-formats.txt
 +++ b/Documentation/printk-formats.txt
-@@ -108,21 +108,23 @@ Physical addresses types ``phys_addr_t``
+@@ -121,21 +121,23 @@ Physical addresses types ``phys_addr_t``
  
  ::
  
diff --git a/lib-vsprintf-additional-kernel-pointer-filtering-options.patch b/lib-vsprintf-additional-kernel-pointer-filtering-options.patch
index 0b6bbf6e2e4e52..0d032d2e12359f 100644
--- a/lib-vsprintf-additional-kernel-pointer-filtering-options.patch
+++ b/lib-vsprintf-additional-kernel-pointer-filtering-options.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/Documentation/printk-formats.txt
 +++ b/Documentation/printk-formats.txt
-@@ -84,6 +84,11 @@ For printing kernel pointers which shoul
+@@ -97,6 +97,11 @@ For printing kernel pointers which shoul
  users. The behaviour of ``%pK`` depends on the ``kptr_restrict sysctl`` - see
  Documentation/sysctl/kernel.txt for more details.
  
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/Documentation/sysctl/kernel.txt
 +++ b/Documentation/sysctl/kernel.txt
-@@ -392,6 +392,9 @@ values to unprivileged users is a concer
+@@ -393,6 +393,9 @@ values to unprivileged users is a concer
  When kptr_restrict is set to (2), kernel pointers printed using
  %pK will be replaced with 0's regardless of privileges.
  
diff --git a/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch b/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch
index 87c3f0546b1097..2d7de517cf72f7 100644
--- a/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch
+++ b/lib-vsprintf-physical-address-kernel-pointer-filtering-options.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/Documentation/sysctl/kernel.txt
 +++ b/Documentation/sysctl/kernel.txt
-@@ -393,7 +393,13 @@ When kptr_restrict is set to (2), kernel
+@@ -394,7 +394,13 @@ When kptr_restrict is set to (2), kernel
  %pK will be replaced with 0's regardless of privileges.
  
  When kptr_restrict is set to (3), kernel pointers printed using
diff --git a/lib-vsprintf-whitelist-stack-traces.patch b/lib-vsprintf-whitelist-stack-traces.patch
index 144168097097e7..554bed6f4adbd0 100644
--- a/lib-vsprintf-whitelist-stack-traces.patch
+++ b/lib-vsprintf-whitelist-stack-traces.patch
@@ -17,8 +17,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/arm64/kernel/traps.c
 +++ b/arch/arm64/kernel/traps.c
-@@ -146,7 +146,7 @@ void dump_backtrace(struct pt_regs *regs
- 	unsigned long irq_stack_ptr;
+@@ -147,7 +147,7 @@ void dump_backtrace(struct pt_regs *regs
+ 	struct stackframe frame;
  	int skip;
  
 -	pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk);
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  	if (!tsk)
  		tsk = current;
-@@ -252,7 +252,7 @@ static int __die(const char *str, int er
+@@ -233,7 +233,7 @@ static int __die(const char *str, int er
  
  	print_modules();
  	__show_regs(regs);
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #endif /*_LINUX_KALLSYMS_H*/
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
-@@ -3148,7 +3148,7 @@ void show_regs_print_info(const char *lo
+@@ -3142,7 +3142,7 @@ void show_regs_print_info(const char *lo
  {
  	dump_stack_print_info(log_lvl);
  
diff --git a/pci_groups.patch b/pci_groups.patch
deleted file mode 100644
index 17ae49a93bd7b6..00000000000000
--- a/pci_groups.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From foo@baz Wed Jul 19 14:37:29 CEST 2017
-Date: Wed, 19 Jul 2017 14:37:29 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: PCI/IB: add support for pci driver attribute groups
-
-Some drivers (specifically the nes IB driver), want to create a lot of
-sysfs driver attributes.  Instead of open-coding the creation and
-removal of these files (and getting it wrong btw), it's a better idea to
-let the driver core handle all of this logic for us.
-
-So add a new field to the pci driver structure, **groups, that allows
-pci drivers to specify an attribute group list it wishes to have created
-when it is registered with the driver core.
-
-Big bonus is now the driver doesn't race with userspace when the sysfs
-files are created vs. when the kobject is announced, so any script/tool
-that actually wanted to use these files will not have to poll waiting
-for them to show up.
-
-Cc: Faisal Latif <faisal.latif@intel.com>
-Cc: Doug Ledford <dledford@redhat.com>
-Cc: Sean Hefty <sean.hefty@intel.com>
-Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
-Cc: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/infiniband/hw/nes/nes.c |   69 +++++++++++++---------------------------
- drivers/pci/pci-driver.c        |    1 
- include/linux/pci.h             |    1 
- 3 files changed, 26 insertions(+), 45 deletions(-)
-
---- a/drivers/infiniband/hw/nes/nes.c
-+++ b/drivers/infiniband/hw/nes/nes.c
-@@ -808,13 +808,6 @@ static void nes_remove(struct pci_dev *p
- }
- 
- 
--static struct pci_driver nes_pci_driver = {
--	.name = DRV_NAME,
--	.id_table = nes_pci_table,
--	.probe = nes_probe,
--	.remove = nes_remove,
--};
--
- static ssize_t adapter_show(struct device_driver *ddp, char *buf)
- {
- 	unsigned int  devfn = 0xffffffff;
-@@ -1156,35 +1149,29 @@ static DRIVER_ATTR_RW(idx_addr);
- static DRIVER_ATTR_RW(idx_data);
- static DRIVER_ATTR_RW(wqm_quanta);
- 
--static int nes_create_driver_sysfs(struct pci_driver *drv)
--{
--	int error;
--	error  = driver_create_file(&drv->driver, &driver_attr_adapter);
--	error |= driver_create_file(&drv->driver, &driver_attr_eeprom_cmd);
--	error |= driver_create_file(&drv->driver, &driver_attr_eeprom_data);
--	error |= driver_create_file(&drv->driver, &driver_attr_flash_cmd);
--	error |= driver_create_file(&drv->driver, &driver_attr_flash_data);
--	error |= driver_create_file(&drv->driver, &driver_attr_nonidx_addr);
--	error |= driver_create_file(&drv->driver, &driver_attr_nonidx_data);
--	error |= driver_create_file(&drv->driver, &driver_attr_idx_addr);
--	error |= driver_create_file(&drv->driver, &driver_attr_idx_data);
--	error |= driver_create_file(&drv->driver, &driver_attr_wqm_quanta);
--	return error;
--}
--
--static void nes_remove_driver_sysfs(struct pci_driver *drv)
--{
--	driver_remove_file(&drv->driver, &driver_attr_adapter);
--	driver_remove_file(&drv->driver, &driver_attr_eeprom_cmd);
--	driver_remove_file(&drv->driver, &driver_attr_eeprom_data);
--	driver_remove_file(&drv->driver, &driver_attr_flash_cmd);
--	driver_remove_file(&drv->driver, &driver_attr_flash_data);
--	driver_remove_file(&drv->driver, &driver_attr_nonidx_addr);
--	driver_remove_file(&drv->driver, &driver_attr_nonidx_data);
--	driver_remove_file(&drv->driver, &driver_attr_idx_addr);
--	driver_remove_file(&drv->driver, &driver_attr_idx_data);
--	driver_remove_file(&drv->driver, &driver_attr_wqm_quanta);
--}
-+static struct attribute *nes_attrs[] = {
-+	&driver_attr_adapter,
-+	&driver_attr_eeprom_cmd,
-+	&driver_attr_eeprom_data,
-+	&driver_attr_flash_cmd,
-+	&driver_attr_flash_data,
-+	&driver_attr_nonidx_addr,
-+	&driver_attr_nonidx_data,
-+	&driver_attr_idx_addr,
-+	&driver_attr_idx_data,
-+	&driver_attr_wqm_quanta,
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(nes);
-+
-+static struct pci_driver nes_pci_driver = {
-+	.name = DRV_NAME,
-+	.id_table = nes_pci_table,
-+	.probe = nes_probe,
-+	.remove = nes_remove,
-+	.groups = nes_groups,
-+};
-+
- 
- /**
-  * nes_init_module - module initialization entry point
-@@ -1192,20 +1179,13 @@ static void nes_remove_driver_sysfs(stru
- static int __init nes_init_module(void)
- {
- 	int retval;
--	int retval1;
- 
- 	retval = nes_cm_start();
- 	if (retval) {
- 		printk(KERN_ERR PFX "Unable to start NetEffect iWARP CM.\n");
- 		return retval;
- 	}
--	retval = pci_register_driver(&nes_pci_driver);
--	if (retval >= 0) {
--		retval1 = nes_create_driver_sysfs(&nes_pci_driver);
--		if (retval1 < 0)
--			printk(KERN_ERR PFX "Unable to create NetEffect sys files.\n");
--	}
--	return retval;
-+	return pci_register_driver(&nes_pci_driver);
- }
- 
- 
-@@ -1215,7 +1195,6 @@ static int __init nes_init_module(void)
- static void __exit nes_exit_module(void)
- {
- 	nes_cm_stop();
--	nes_remove_driver_sysfs(&nes_pci_driver);
- 
- 	pci_unregister_driver(&nes_pci_driver);
- }
---- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -1307,6 +1307,7 @@ int __pci_register_driver(struct pci_dri
- 	drv->driver.bus = &pci_bus_type;
- 	drv->driver.owner = owner;
- 	drv->driver.mod_name = mod_name;
-+	drv->driver.groups = drv->groups;
- 
- 	spin_lock_init(&drv->dynids.lock);
- 	INIT_LIST_HEAD(&drv->dynids.list);
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -729,6 +729,7 @@ struct pci_driver {
- 	void (*shutdown) (struct pci_dev *dev);
- 	int (*sriov_configure) (struct pci_dev *dev, int num_vfs); /* PF pdev */
- 	const struct pci_error_handlers *err_handler;
-+	const struct attribute_group **groups;
- 	struct device_driver	driver;
- 	struct pci_dynids dynids;
- };
diff --git a/series b/series
index 2905480f715f8d..9fcc92c87f661e 100644
--- a/series
+++ b/series
@@ -8,22 +8,12 @@ lib-vsprintf-default-kptr_restrict-to-the-maximum-value.patch
 lib-vsprintf-add-pap-padp-options.patch
 drivers-uio-un-restrict-sysfs-pointers-for-uio.patch
 
-u01.patch
-u02.patch
-u03.patch
-u04.patch
-u05.patch
-u06.patch
-u07.patch
-u08.patch
-u09.patch
 
 
 
 
 0002-CHROMIUM-android-fix-warning-when-releasing-active-s.patch
 0003-goldfish-Add-goldfish-sync-driver.patch
-0001-drbd-rename-usermode_helper-to-drbd_usermode_helper.patch
 
 ## broken patch!
 #
@@ -49,12 +39,8 @@ u09.patch
 
 
 #
-d05.patch
-d13.patch
-d14.patch
-d16.patch
 
 d99.patch
-pci_groups.patch
+d01.patch
 qlcnic_sysfs.patch
 #
diff --git a/u01.patch b/u01.patch
deleted file mode 100644
index 6d773a3540bd3b..00000000000000
--- a/u01.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From foo@baz Wed Jul 19 13:57:51 CEST 2017
-Date: Wed, 19 Jul 2017 13:57:51 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: atm: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so just remove all
-usage of it in the USB ATM drivers.  Along with this, some
-DRIVER_VERSION macros were removed as they are also pointless.
-
-Cc: Duncan Sands <duncan.sands@free.fr>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/atm/cxacru.c   |    2 --
- drivers/usb/atm/speedtch.c |    4 +---
- drivers/usb/atm/usbatm.c   |    4 +---
- drivers/usb/atm/xusbatm.c  |    1 -
- 4 files changed, 2 insertions(+), 9 deletions(-)
-
---- a/drivers/usb/atm/cxacru.c
-+++ b/drivers/usb/atm/cxacru.c
-@@ -43,7 +43,6 @@
- #include "usbatm.h"
- 
- #define DRIVER_AUTHOR	"Roman Kagan, David Woodhouse, Duncan Sands, Simon Arlott"
--#define DRIVER_VERSION	"0.4"
- #define DRIVER_DESC	"Conexant AccessRunner ADSL USB modem driver"
- 
- static const char cxacru_driver_name[] = "cxacru";
-@@ -1380,4 +1379,3 @@ module_usb_driver(cxacru_usb_driver);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
--MODULE_VERSION(DRIVER_VERSION);
---- a/drivers/usb/atm/speedtch.c
-+++ b/drivers/usb/atm/speedtch.c
-@@ -40,8 +40,7 @@
- #include "usbatm.h"
- 
- #define DRIVER_AUTHOR	"Johan Verrept, Duncan Sands <duncan.sands@free.fr>"
--#define DRIVER_VERSION	"1.10"
--#define DRIVER_DESC	"Alcatel SpeedTouch USB driver version " DRIVER_VERSION
-+#define DRIVER_DESC	"Alcatel SpeedTouch USB driver"
- 
- static const char speedtch_driver_name[] = "speedtch";
- 
-@@ -962,4 +961,3 @@ module_usb_driver(speedtch_usb_driver);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
--MODULE_VERSION(DRIVER_VERSION);
---- a/drivers/usb/atm/usbatm.c
-+++ b/drivers/usb/atm/usbatm.c
-@@ -93,8 +93,7 @@ static int usbatm_print_packet(struct us
- #endif
- 
- #define DRIVER_AUTHOR	"Johan Verrept, Duncan Sands <duncan.sands@free.fr>"
--#define DRIVER_VERSION	"1.10"
--#define DRIVER_DESC	"Generic USB ATM/DSL I/O, version " DRIVER_VERSION
-+#define DRIVER_DESC	"Generic USB ATM/DSL I/O"
- 
- static const char usbatm_driver_name[] = "usbatm";
- 
-@@ -1315,7 +1314,6 @@ module_exit(usbatm_usb_exit);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
--MODULE_VERSION(DRIVER_VERSION);
- 
- /************
- **  debug  **
---- a/drivers/usb/atm/xusbatm.c
-+++ b/drivers/usb/atm/xusbatm.c
-@@ -228,4 +228,3 @@ module_exit(xusbatm_exit);
- MODULE_AUTHOR("Roman Kagan, Duncan Sands");
- MODULE_DESCRIPTION("Driver for USB ADSL modems initialized in userspace");
- MODULE_LICENSE("GPL");
--MODULE_VERSION("0.1");
diff --git a/u02.patch b/u02.patch
deleted file mode 100644
index ea44015fcf4926..00000000000000
--- a/u02.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From foo@baz Wed Jul 19 13:59:41 CEST 2017
-Date: Wed, 19 Jul 2017 13:59:41 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: chipidea: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so remove the use of it
-in the chipidea CI13XXX driver.
-
-Cc: Peter Chen <Peter.Chen@nxp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/chipidea/ci_hdrc_pci.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/usb/chipidea/ci_hdrc_pci.c
-+++ b/drivers/usb/chipidea/ci_hdrc_pci.c
-@@ -170,5 +170,4 @@ module_pci_driver(ci_hdrc_pci_driver);
- MODULE_AUTHOR("MIPS - David Lopo <dlopo@chipidea.mips.com>");
- MODULE_DESCRIPTION("MIPS CI13XXX USB Peripheral Controller");
- MODULE_LICENSE("GPL");
--MODULE_VERSION("June 2008");
- MODULE_ALIAS("platform:ci13xxx_pci");
diff --git a/u03.patch b/u03.patch
deleted file mode 100644
index 57942d8b76f0c4..00000000000000
--- a/u03.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From foo@baz Wed Jul 19 14:01:06 CEST 2017
-Date: Wed, 19 Jul 2017 14:01:06 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: cdc-wdm: remove unneeded DRIVER_VERSION define
-
-No one uses the DRIVER_VERSION define in this driver, so just delete it.
-
-Cc: Oliver Neukum <oneukum@suse.com>
-Cc: "Bjørn Mork" <bjorn@mork.no>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/class/cdc-wdm.c |    4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/usb/class/cdc-wdm.c
-+++ b/drivers/usb/class/cdc-wdm.c
-@@ -26,10 +26,6 @@
- #include <asm/unaligned.h>
- #include <linux/usb/cdc-wdm.h>
- 
--/*
-- * Version Information
-- */
--#define DRIVER_VERSION "v0.03"
- #define DRIVER_AUTHOR "Oliver Neukum"
- #define DRIVER_DESC "USB Abstract Control Model driver for USB WCM Device Management"
- 
diff --git a/u04.patch b/u04.patch
deleted file mode 100644
index f0d76f8cd45ced..00000000000000
--- a/u04.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From foo@baz Wed Jul 19 14:02:47 CEST 2017
-Date: Wed, 19 Jul 2017 14:02:47 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: gadget: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so just remove all
-usage of it in the USB gadget drivers.  Along with this, some
-DRIVER_VERSION macros were removed as they are also pointless.
-
-Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Cc: Felipe Balbi <balbi@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/gadget/legacy/webcam.c   |    1 -
- drivers/usb/gadget/udc/mv_udc_core.c |    2 --
- drivers/usb/gadget/udc/s3c2410_udc.c |    4 +---
- 3 files changed, 1 insertion(+), 6 deletions(-)
-
---- a/drivers/usb/gadget/legacy/webcam.c
-+++ b/drivers/usb/gadget/legacy/webcam.c
-@@ -436,5 +436,4 @@ module_usb_composite_driver(webcam_drive
- MODULE_AUTHOR("Laurent Pinchart");
- MODULE_DESCRIPTION("Webcam Video Gadget");
- MODULE_LICENSE("GPL");
--MODULE_VERSION("0.1.0");
- 
---- a/drivers/usb/gadget/udc/mv_udc_core.c
-+++ b/drivers/usb/gadget/udc/mv_udc_core.c
-@@ -39,7 +39,6 @@
- #include "mv_udc.h"
- 
- #define DRIVER_DESC		"Marvell PXA USB Device Controller driver"
--#define DRIVER_VERSION		"8 Nov 2010"
- 
- #define ep_dir(ep)	(((ep)->ep_num == 0) ? \
- 				((ep)->udc->ep0_dir) : ((ep)->direction))
-@@ -2427,5 +2426,4 @@ module_platform_driver(udc_driver);
- MODULE_ALIAS("platform:mv-udc");
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_AUTHOR("Chao Xie <chao.xie@marvell.com>");
--MODULE_VERSION(DRIVER_VERSION);
- MODULE_LICENSE("GPL");
---- a/drivers/usb/gadget/udc/s3c2410_udc.c
-+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
-@@ -51,7 +51,6 @@
- #include "s3c2410_udc.h"
- 
- #define DRIVER_DESC	"S3C2410 USB Device Controller Gadget"
--#define DRIVER_VERSION	"29 Apr 2007"
- #define DRIVER_AUTHOR	"Herbert Pötzl <herbert@13thfloor.at>, " \
- 			"Arnaud Patard <arnaud.patard@rtp-net.org>"
- 
-@@ -1996,7 +1995,7 @@ static int __init udc_init(void)
- {
- 	int retval;
- 
--	dprintk(DEBUG_NORMAL, "%s: version %s\n", gadget_name, DRIVER_VERSION);
-+	dprintk(DEBUG_NORMAL, "%s\n", gadget_name);
- 
- 	s3c2410_udc_debugfs_root = debugfs_create_dir(gadget_name, NULL);
- 	if (IS_ERR(s3c2410_udc_debugfs_root)) {
-@@ -2027,5 +2026,4 @@ module_exit(udc_exit);
- 
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
--MODULE_VERSION(DRIVER_VERSION);
- MODULE_LICENSE("GPL");
diff --git a/u05.patch b/u05.patch
deleted file mode 100644
index e84e254fea505c..00000000000000
--- a/u05.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From foo@baz Wed Jul 19 14:04:02 CEST 2017
-Date: Wed, 19 Jul 2017 14:04:02 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: microtek: remove unneeded DRIVER_VERSION macro
-
-No one uses the DRIVER_VERSION define in this driver, so just delete it.
-
-Cc: Oliver Neukum <oneukum@suse.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/image/microtek.c |    4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/usb/image/microtek.c
-+++ b/drivers/usb/image/microtek.c
-@@ -137,10 +137,6 @@
- 
- #include "microtek.h"
- 
--/*
-- * Version Information
-- */
--#define DRIVER_VERSION "v0.4.3"
- #define DRIVER_AUTHOR "John Fremlin <vii@penguinpowered.com>, Oliver Neukum <Oliver.Neukum@lrz.uni-muenchen.de>"
- #define DRIVER_DESC "Microtek Scanmaker X6 USB scanner driver"
- 
diff --git a/u06.patch b/u06.patch
deleted file mode 100644
index 1b1668a05afee1..00000000000000
--- a/u06.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From foo@baz Wed Jul 19 14:04:54 CEST 2017
-Date: Wed, 19 Jul 2017 14:04:54 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: misc: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so just remove all
-usage of it in the USB misc drivers.  Along with this, some
-DRIVER_VERSION macros were removed as they are also pointless.
-
-Cc: Keith Packard <keithp@keithp.com>
-Cc: Juergen Stuber <starblue@users.sourceforge.net>
-Cc: Cesar Miquel <miquel@df.uba.ar>
-Cc: Richard Leitner <richard.leitner@skidata.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/misc/adutux.c         |    2 --
- drivers/usb/misc/chaoskey.c       |    2 --
- drivers/usb/misc/cytherm.c        |    1 -
- drivers/usb/misc/idmouse.c        |    2 --
- drivers/usb/misc/iowarrior.c      |    4 +---
- drivers/usb/misc/ldusb.c          |    1 -
- drivers/usb/misc/legousbtower.c   |    2 --
- drivers/usb/misc/rio500.c         |    4 ----
- drivers/usb/misc/trancevibrator.c |    2 --
- drivers/usb/misc/usb251xb.c       |    1 -
- drivers/usb/misc/uss720.c         |    7 +------
- 11 files changed, 2 insertions(+), 26 deletions(-)
-
---- a/drivers/usb/misc/adutux.c
-+++ b/drivers/usb/misc/adutux.c
-@@ -29,8 +29,6 @@
- #include <linux/mutex.h>
- #include <linux/uaccess.h>
- 
--/* Version Information */
--#define DRIVER_VERSION "v0.0.13"
- #define DRIVER_AUTHOR "John Homppi"
- #define DRIVER_DESC "adutux (see www.ontrak.net)"
- 
---- a/drivers/usb/misc/chaoskey.c
-+++ b/drivers/usb/misc/chaoskey.c
-@@ -42,12 +42,10 @@ static int chaoskey_rng_read(struct hwrn
- 	dev_err(&(usb_if)->dev, format, ## arg)
- 
- /* Version Information */
--#define DRIVER_VERSION	"v0.1"
- #define DRIVER_AUTHOR	"Keith Packard, keithp@keithp.com"
- #define DRIVER_DESC	"Altus Metrum ChaosKey driver"
- #define DRIVER_SHORT	"chaoskey"
- 
--MODULE_VERSION(DRIVER_VERSION);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
---- a/drivers/usb/misc/cytherm.c
-+++ b/drivers/usb/misc/cytherm.c
-@@ -20,7 +20,6 @@
- #include <linux/module.h>
- #include <linux/usb.h>
- 
--#define DRIVER_VERSION "v1.0"
- #define DRIVER_AUTHOR "Erik Rigtorp"
- #define DRIVER_DESC "Cypress USB Thermometer driver"
- 
---- a/drivers/usb/misc/idmouse.c
-+++ b/drivers/usb/misc/idmouse.c
-@@ -33,8 +33,6 @@
- #define HEADER "P5 225 289 255 "
- #define IMGSIZE ((WIDTH * HEIGHT) + sizeof(HEADER)-1)
- 
--/* version information */
--#define DRIVER_VERSION "0.6"
- #define DRIVER_SHORT   "idmouse"
- #define DRIVER_AUTHOR  "Florian 'Floe' Echtler <echtler@fs.tum.de>"
- #define DRIVER_DESC    "Siemens ID Mouse FingerTIP Sensor Driver"
---- a/drivers/usb/misc/iowarrior.c
-+++ b/drivers/usb/misc/iowarrior.c
-@@ -21,10 +21,8 @@
- #include <linux/poll.h>
- #include <linux/usb/iowarrior.h>
- 
--/* Version Information */
--#define DRIVER_VERSION "v0.4.0"
- #define DRIVER_AUTHOR "Christian Lucht <lucht@codemercs.com>"
--#define DRIVER_DESC "USB IO-Warrior driver (Linux 2.6.x)"
-+#define DRIVER_DESC "USB IO-Warrior driver"
- 
- #define USB_VENDOR_ID_CODEMERCS		1984
- /* low speed iowarrior */
---- a/drivers/usb/misc/ldusb.c
-+++ b/drivers/usb/misc/ldusb.c
-@@ -112,7 +112,6 @@ static const struct usb_device_id ld_usb
- 	{ }					/* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, ld_usb_table);
--MODULE_VERSION("V0.14");
- MODULE_AUTHOR("Michael Hund <mhund@ld-didactic.de>");
- MODULE_DESCRIPTION("LD USB Driver");
- MODULE_LICENSE("GPL");
---- a/drivers/usb/misc/legousbtower.c
-+++ b/drivers/usb/misc/legousbtower.c
-@@ -88,8 +88,6 @@
- #include <linux/poll.h>
- 
- 
--/* Version Information */
--#define DRIVER_VERSION "v0.96"
- #define DRIVER_AUTHOR "Juergen Stuber <starblue@sourceforge.net>"
- #define DRIVER_DESC "LEGO USB Tower Driver"
- 
---- a/drivers/usb/misc/rio500.c
-+++ b/drivers/usb/misc/rio500.c
-@@ -43,10 +43,6 @@
- 
- #include "rio500_usb.h"
- 
--/*
-- * Version Information
-- */
--#define DRIVER_VERSION "v1.1"
- #define DRIVER_AUTHOR "Cesar Miquel <miquel@df.uba.ar>"
- #define DRIVER_DESC "USB Rio 500 driver"
- 
---- a/drivers/usb/misc/trancevibrator.c
-+++ b/drivers/usb/misc/trancevibrator.c
-@@ -25,8 +25,6 @@
- #include <linux/module.h>
- #include <linux/usb.h>
- 
--/* Version Information */
--#define DRIVER_VERSION "v1.1"
- #define DRIVER_AUTHOR "Sam Hocevar, sam@zoy.org"
- #define DRIVER_DESC "PlayStation 2 Trance Vibrator driver"
- 
---- a/drivers/usb/misc/usb251xb.c
-+++ b/drivers/usb/misc/usb251xb.c
-@@ -114,7 +114,6 @@
- 
- #define DRIVER_NAME	"usb251xb"
- #define DRIVER_DESC	"Microchip USB 2.0 Hi-Speed Hub Controller"
--#define DRIVER_VERSION	"1.0"
- 
- struct usb251xb {
- 	struct device *dev;
---- a/drivers/usb/misc/uss720.c
-+++ b/drivers/usb/misc/uss720.c
-@@ -52,10 +52,6 @@
- #include <linux/slab.h>
- #include <linux/sched/signal.h>
- 
--/*
-- * Version Information
-- */
--#define DRIVER_VERSION "v0.6"
- #define DRIVER_AUTHOR "Thomas M. Sailer, t.sailer@alumni.ethz.ch"
- #define DRIVER_DESC "USB Parport Cable driver for Cables using the Lucent Technologies USS720 Chip"
- 
-@@ -816,8 +812,7 @@ static int __init uss720_init(void)
- 	if (retval)
- 		goto out;
- 
--	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
--	       DRIVER_DESC "\n");
-+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
- 	printk(KERN_INFO KBUILD_MODNAME ": NOTE: this is a special purpose "
- 	       "driver to allow nonstandard\n");
- 	printk(KERN_INFO KBUILD_MODNAME ": protocols (eg. bitbang) over "
diff --git a/u07.patch b/u07.patch
deleted file mode 100644
index 4c6dc6b0d2478f..00000000000000
--- a/u07.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From foo@baz Wed Jul 19 14:07:00 CEST 2017
-Date: Wed, 19 Jul 2017 14:07:00 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: phy: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so remove the
-use of it in the marvel phy driver, along with the DRIVER_VERSION
-define.
-
-Cc: Felipe Balbi <balbi@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/phy/phy-mv-usb.c |    2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/usb/phy/phy-mv-usb.c
-+++ b/drivers/usb/phy/phy-mv-usb.c
-@@ -29,10 +29,8 @@
- #include "phy-mv-usb.h"
- 
- #define	DRIVER_DESC	"Marvell USB OTG transceiver driver"
--#define	DRIVER_VERSION	"Jan 20, 2010"
- 
- MODULE_DESCRIPTION(DRIVER_DESC);
--MODULE_VERSION(DRIVER_VERSION);
- MODULE_LICENSE("GPL");
- 
- static const char driver_name[] = "mv-otg";
diff --git a/u08.patch b/u08.patch
deleted file mode 100644
index af618f605017c2..00000000000000
--- a/u08.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From foo@baz Wed Jul 19 14:07:42 CEST 2017
-Date: Wed, 19 Jul 2017 14:07:42 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: realtek_cr: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so remove the
-use of it in the Realtek USB card reader driver.
-
-Cc: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/storage/realtek_cr.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/usb/storage/realtek_cr.c
-+++ b/drivers/usb/storage/realtek_cr.c
-@@ -47,7 +47,6 @@
- MODULE_DESCRIPTION("Driver for Realtek USB Card Reader");
- MODULE_AUTHOR("wwang <wei_wang@realsil.com.cn>");
- MODULE_LICENSE("GPL");
--MODULE_VERSION("1.03");
- 
- static int auto_delink_en = 1;
- module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
diff --git a/u09.patch b/u09.patch
deleted file mode 100644
index f3896d8bc60056..00000000000000
--- a/u09.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From foo@baz Wed Jul 19 14:08:38 CEST 2017
-Date: Wed, 19 Jul 2017 14:08:38 +0200
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: USB: usbip: remove unneeded MODULE_VERSION() usage
-
-MODULE_VERSION is useless for in-kernel drivers, so just remove all
-usage of it in the USB usbip drivers.  Along with this, the
-USBIP_VERSION macros was removed as is was also pointless, as well as
-printing out the driver version to the syslog at init time, which is not
-necessary at all.
-
-Cc: Valentina Manea <valentina.manea.m@gmail.com>
-Cc: Shuah Khan <shuah@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-
----
- drivers/usb/usbip/stub_main.c    |    2 --
- drivers/usb/usbip/usbip_common.c |    2 --
- drivers/usb/usbip/usbip_common.h |    2 --
- drivers/usb/usbip/vhci_hcd.c     |    2 --
- 4 files changed, 8 deletions(-)
-
---- a/drivers/usb/usbip/stub_main.c
-+++ b/drivers/usb/usbip/stub_main.c
-@@ -302,7 +302,6 @@ static int __init usbip_host_init(void)
- 		goto err_create_file;
- 	}
- 
--	pr_info(DRIVER_DESC " v" USBIP_VERSION "\n");
- 	return ret;
- 
- err_create_file:
-@@ -335,4 +334,3 @@ module_exit(usbip_host_exit);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
--MODULE_VERSION(USBIP_VERSION);
---- a/drivers/usb/usbip/usbip_common.c
-+++ b/drivers/usb/usbip/usbip_common.c
-@@ -763,7 +763,6 @@ static int __init usbip_core_init(void)
- {
- 	int ret;
- 
--	pr_info(DRIVER_DESC " v" USBIP_VERSION "\n");
- 	ret = usbip_init_eh();
- 	if (ret)
- 		return ret;
-@@ -783,4 +782,3 @@ module_exit(usbip_core_exit);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
--MODULE_VERSION(USBIP_VERSION);
---- a/drivers/usb/usbip/usbip_common.h
-+++ b/drivers/usb/usbip/usbip_common.h
-@@ -34,8 +34,6 @@
- #include <linux/sched/task.h>
- #include <uapi/linux/usbip.h>
- 
--#define USBIP_VERSION "1.0.0"
--
- #undef pr_fmt
- 
- #ifdef DEBUG
---- a/drivers/usb/usbip/vhci_hcd.c
-+++ b/drivers/usb/usbip/vhci_hcd.c
-@@ -1516,7 +1516,6 @@ static int __init vhci_hcd_init(void)
- 		}
- 	}
- 
--	pr_info(DRIVER_DESC " v" USBIP_VERSION "\n");
- 	return ret;
- 
- err_add_hcd:
-@@ -1542,4 +1541,3 @@ module_exit(vhci_hcd_exit);
- MODULE_AUTHOR(DRIVER_AUTHOR);
- MODULE_DESCRIPTION(DRIVER_DESC);
- MODULE_LICENSE("GPL");
--MODULE_VERSION(USBIP_VERSION);
diff --git a/usb_DEVICE_ATTR.patch b/usb_DEVICE_ATTR.patch
index e84a4722fb0337..7d1a3fb433a469 100644
--- a/usb_DEVICE_ATTR.patch
+++ b/usb_DEVICE_ATTR.patch
@@ -140,7 +140,7 @@
  
 --- a/drivers/usb/gadget/udc/core.c
 +++ b/drivers/usb/gadget/udc/core.c
-@@ -1421,8 +1421,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_
+@@ -1427,8 +1427,8 @@ EXPORT_SYMBOL_GPL(usb_gadget_unregister_
  
  /* ------------------------------------------------------------------------- */
  
@@ -151,7 +151,7 @@
  {
  	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
  
-@@ -1431,10 +1431,11 @@ static ssize_t usb_udc_srp_store(struct
+@@ -1437,10 +1437,11 @@ static ssize_t usb_udc_srp_store(struct
  
  	return n;
  }
@@ -166,7 +166,7 @@
  {
  	struct usb_udc		*udc = container_of(dev, struct usb_udc, dev);
  
-@@ -1457,7 +1458,7 @@ static ssize_t usb_udc_softconn_store(st
+@@ -1463,7 +1464,7 @@ static ssize_t usb_udc_softconn_store(st
  
  	return n;
  }
@@ -315,7 +315,7 @@
  static int cypress_probe(struct usb_interface *interface,
 --- a/drivers/usb/misc/cytherm.c
 +++ b/drivers/usb/misc/cytherm.c
-@@ -83,7 +83,8 @@ static int vendor_command(struct usb_dev
+@@ -82,7 +82,8 @@ static int vendor_command(struct usb_dev
  #define BRIGHTNESS 0x2c     /* RAM location for brightness value */
  #define BRIGHTNESS_SEM 0x2b /* RAM location for brightness semaphore */
  
@@ -325,7 +325,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);    
  	struct usb_cytherm *cytherm = usb_get_intfdata(intf);     
-@@ -91,8 +92,9 @@ static ssize_t show_brightness(struct de
+@@ -90,8 +91,9 @@ static ssize_t show_brightness(struct de
  	return sprintf(buf, "%i", cytherm->brightness);
  }
  
@@ -337,7 +337,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);
  	struct usb_cytherm *cytherm = usb_get_intfdata(intf);
-@@ -126,15 +128,14 @@ static ssize_t set_brightness(struct dev
+@@ -125,15 +127,14 @@ static ssize_t set_brightness(struct dev
     
  	return count;
  }
@@ -356,7 +356,7 @@
  {
  
  	struct usb_interface *intf = to_usb_interface(dev);
-@@ -166,19 +167,13 @@ static ssize_t show_temp(struct device *
+@@ -165,19 +166,13 @@ static ssize_t show_temp(struct device *
  	return sprintf(buf, "%c%i.%i", sign ? '-' : '+', temp >> 1,
  		       5*(temp - ((temp >> 1) << 1)));
  }
@@ -379,7 +379,7 @@
  {
  
  	struct usb_interface *intf = to_usb_interface(dev);
-@@ -205,17 +200,11 @@ static ssize_t show_button(struct device
+@@ -204,17 +199,11 @@ static ssize_t show_button(struct device
  	else
  		return sprintf(buf, "0");
  }
@@ -400,7 +400,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);
  	struct usb_cytherm *cytherm = usb_get_intfdata(intf);
-@@ -239,7 +228,8 @@ static ssize_t show_port0(struct device
+@@ -238,7 +227,8 @@ static ssize_t show_port0(struct device
  }
  
  
@@ -410,7 +410,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);
  	struct usb_cytherm *cytherm = usb_get_intfdata(intf);
-@@ -268,10 +258,10 @@ static ssize_t set_port0(struct device *
+@@ -267,10 +257,10 @@ static ssize_t set_port0(struct device *
  
  	return count;
  }
@@ -424,7 +424,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);
  	struct usb_cytherm *cytherm = usb_get_intfdata(intf);
-@@ -295,7 +285,8 @@ static ssize_t show_port1(struct device
+@@ -294,7 +284,8 @@ static ssize_t show_port1(struct device
  }
  
  
@@ -434,7 +434,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);
  	struct usb_cytherm *cytherm = usb_get_intfdata(intf);
-@@ -324,8 +315,7 @@ static ssize_t set_port1(struct device *
+@@ -323,8 +314,7 @@ static ssize_t set_port1(struct device *
  
  	return count;
  }
@@ -446,7 +446,7 @@
  
 --- a/drivers/usb/misc/trancevibrator.c
 +++ b/drivers/usb/misc/trancevibrator.c
-@@ -45,7 +45,7 @@ struct trancevibrator {
+@@ -43,7 +43,7 @@ struct trancevibrator {
  	unsigned int speed;
  };
  
@@ -455,7 +455,7 @@
  			  char *buf)
  {
  	struct usb_interface *intf = to_usb_interface(dev);
-@@ -54,8 +54,8 @@ static ssize_t show_speed(struct device
+@@ -52,8 +52,8 @@ static ssize_t show_speed(struct device
  	return sprintf(buf, "%d\n", tv->speed);
  }
  
@@ -466,7 +466,7 @@
  {
  	struct usb_interface *intf = to_usb_interface(dev);
  	struct trancevibrator *tv = usb_get_intfdata(intf);
-@@ -84,8 +84,7 @@ static ssize_t set_speed(struct device *
+@@ -82,8 +82,7 @@ static ssize_t set_speed(struct device *
  	}
  	return count;
  }
@@ -678,7 +678,7 @@
  			    const char *buf, size_t count)
  {
  	struct socket *socket;
-@@ -390,7 +390,7 @@ static ssize_t store_attach(struct devic
+@@ -394,7 +394,7 @@ static ssize_t store_attach(struct devic
  
  	return count;
  }