reorder some driver core patches

5 files changed, 23 insertions, 22 deletions

diff --git a/driver-core-bus_type-add-dev_groups.patch b/driver-core-bus_type-add-dev_groups.patch
index b312a37ecbc34b..794e53800a46fc 100644
--- a/driver-core-bus_type-add-dev_groups.patch
+++ b/driver-core-bus_type-add-dev_groups.patch
@@ -64,9 +64,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/drivers/base/core.c
 +++ b/drivers/base/core.c
-@@ -433,8 +433,7 @@ static ssize_t store_online(struct devic
- static struct device_attribute online_attr =
- 	__ATTR(online, S_IRUGO | S_IWUSR, show_online, store_online);
+@@ -491,8 +491,7 @@ static void device_remove_bin_attributes
+ 			device_remove_bin_file(dev, &attrs[i]);
+ }
  
 -static int device_add_groups(struct device *dev,
 -			     const struct attribute_group **groups)
@@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
  	int error = 0;
  	int i;
-@@ -453,8 +452,8 @@ static int device_add_groups(struct devi
+@@ -511,8 +510,8 @@ static int device_add_groups(struct devi
  	return error;
  }
  
diff --git a/driver-core-remove-dev_attrs-from-struct-class.patch b/driver-core-remove-dev_attrs-from-struct-class.patch
index bea741a07f5754..ec54345270eba2 100644
--- a/driver-core-remove-dev_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_attrs-from-struct-class.patch
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int device_add_bin_attributes(struct device *dev,
  				     struct bin_attribute *attrs)
  {
-@@ -531,12 +502,9 @@ static int device_add_attrs(struct devic
+@@ -530,12 +501,9 @@ static int device_add_attrs(struct devic
  		error = device_add_groups(dev, class->dev_groups);
  		if (error)
  			return error;
@@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	}
  
  	if (type) {
-@@ -563,9 +531,6 @@ static int device_add_attrs(struct devic
+@@ -562,9 +530,6 @@ static int device_add_attrs(struct devic
   err_remove_class_bin_attrs:
  	if (class)
  		device_remove_bin_attributes(dev, class->dev_bin_attrs);
@@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   err_remove_class_groups:
  	if (class)
  		device_remove_groups(dev, class->dev_groups);
-@@ -585,7 +550,6 @@ static void device_remove_attrs(struct d
+@@ -584,7 +549,6 @@ static void device_remove_attrs(struct d
  		device_remove_groups(dev, type->groups);
  
  	if (class) {
@@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	}
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
-@@ -321,7 +321,6 @@ int subsys_virtual_register(struct bus_t
+@@ -327,7 +327,6 @@ int subsys_virtual_register(struct bus_t
   * @owner:	The module owner.
   * @class_attrs: Default attributes of this class.
   * @dev_groups:	Default attributes of the devices that belong to the class.
@@ -93,7 +93,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * @dev_bin_attrs: Default binary attributes of the devices belong to the class.
   * @dev_kobj:	The kobject that represents this class and links it into the hierarchy.
   * @dev_uevent:	Called when a device is added, removed from this class, or a
-@@ -350,7 +349,6 @@ struct class {
+@@ -356,7 +355,6 @@ struct class {
  	struct module		*owner;
  
  	struct class_attribute		*class_attrs;
diff --git a/driver-core-remove-dev_bin_attrs-from-struct-class.patch b/driver-core-remove-dev_bin_attrs-from-struct-class.patch
index e1b863ee2fe98c..b99ca8eb1363b4 100644
--- a/driver-core-remove-dev_bin_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_bin_attrs-from-struct-class.patch
@@ -50,10 +50,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -			device_remove_bin_file(dev, &attrs[i]);
 -}
 -
- static int device_add_groups(struct device *dev,
- 			     const struct attribute_group **groups)
+ int device_add_groups(struct device *dev, const struct attribute_group **groups)
  {
-@@ -502,15 +473,12 @@ static int device_add_attrs(struct devic
+ 	int error = 0;
+@@ -501,15 +472,12 @@ static int device_add_attrs(struct devic
  		error = device_add_groups(dev, class->dev_groups);
  		if (error)
  			return error;
@@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	}
  
  	error = device_add_groups(dev, dev->groups);
-@@ -528,9 +496,6 @@ static int device_add_attrs(struct devic
+@@ -527,9 +495,6 @@ static int device_add_attrs(struct devic
   err_remove_type_groups:
  	if (type)
  		device_remove_groups(dev, type->groups);
@@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   err_remove_class_groups:
  	if (class)
  		device_remove_groups(dev, class->dev_groups);
-@@ -549,10 +514,8 @@ static void device_remove_attrs(struct d
+@@ -548,10 +513,8 @@ static void device_remove_attrs(struct d
  	if (type)
  		device_remove_groups(dev, type->groups);
  
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
-@@ -321,7 +321,6 @@ int subsys_virtual_register(struct bus_t
+@@ -327,7 +327,6 @@ int subsys_virtual_register(struct bus_t
   * @owner:	The module owner.
   * @class_attrs: Default attributes of this class.
   * @dev_groups:	Default attributes of the devices that belong to the class.
@@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * @dev_kobj:	The kobject that represents this class and links it into the hierarchy.
   * @dev_uevent:	Called when a device is added, removed from this class, or a
   *		few other things that generate uevents to add the environment
-@@ -350,7 +349,6 @@ struct class {
+@@ -356,7 +355,6 @@ struct class {
  
  	struct class_attribute		*class_attrs;
  	const struct attribute_group	**dev_groups;
diff --git a/f4.patch b/f4.patch
index 371e5f07871331..1aef34afa81642 100644
--- a/f4.patch
+++ b/f4.patch
@@ -221,7 +221,7 @@
  static void pmu_dev_release(struct device *dev)
 --- a/kernel/workqueue.c
 +++ b/kernel/workqueue.c
-@@ -3081,25 +3081,26 @@ static struct workqueue_struct *dev_to_w
+@@ -3086,25 +3086,26 @@ static struct workqueue_struct *dev_to_w
  	return wq_dev->wq;
  }
  
@@ -255,7 +255,7 @@
  {
  	struct workqueue_struct *wq = dev_to_wq(dev);
  	int val;
-@@ -3110,12 +3111,14 @@ static ssize_t wq_max_active_store(struc
+@@ -3115,12 +3116,14 @@ static ssize_t wq_max_active_store(struc
  	workqueue_set_max_active(wq, val);
  	return count;
  }
@@ -274,7 +274,7 @@
  
  static ssize_t wq_pool_ids_show(struct device *dev,
  				struct device_attribute *attr, char *buf)
-@@ -3265,7 +3268,7 @@ static struct device_attribute wq_sysfs_
+@@ -3270,7 +3273,7 @@ static struct device_attribute wq_sysfs_
  
  static struct bus_type wq_subsys = {
  	.name				= "workqueue",
diff --git a/series b/series
index ddc45ced13b4de..8b8ea1188447fc 100644
--- a/series
+++ b/series
@@ -76,6 +76,10 @@ c2port-convert-class-code-to-use-bin_attrs-in-groups.patch
 hid-roccat-convert-class-code-to-use-bin_attrs-in-groups.patch
 pwm-convert-class-code-to-use-dev_groups.patch
 
+driver-core-bus_type-add-dev_groups.patch
+driver-core-bus_type-add-drv_groups.patch
+driver-core-bus_type-add-bus_groups.patch
+
 driver-core-remove-dev_attrs-from-struct-class.patch
 driver-core-remove-dev_bin_attrs-from-struct-class.patch
 
@@ -86,9 +90,6 @@ driver-core-remove-dev_bin_attrs-from-struct-class.patch
 #gregkh/gkh-version.patch
 
 usb-serial-move-the-simple-drivers-into.patch
-driver-core-bus_type-add-dev_groups.patch
-driver-core-bus_type-add-drv_groups.patch
-driver-core-bus_type-add-bus_groups.patch
 
 
 f1.patch