fuzz cleanups

author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2013-10-05 18:26:56 -0700
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2013-10-05 18:26:56 -0700
commit: 439aaed86577bc756086c2193f8fa23ae48d6722 (patch)
tree: 89d95cc091da3c98d8dba1236349837d091adcfd
parent: e85b45737435bc1541a45058b39c25aa522cf03b (diff)
download: patches-439aaed86577bc756086c2193f8fa23ae48d6722.tar.gz
14 files changed, 22 insertions, 22 deletions
diff --git a/driver-core-remove-dev_attrs-from-struct-class.patch b/driver-core-remove-dev_attrs-from-struct-class.patch
index c187a47e80858f..ad192d9cd1126d 100644
--- a/driver-core-remove-dev_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_attrs-from-struct-class.patch
@@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	}
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
-@@ -329,7 +329,6 @@ int subsys_virtual_register(struct bus_t
+@@ -325,7 +325,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
-@@ -358,7 +357,6 @@ struct class {
+@@ -354,7 +353,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 f93d23473aab2e..158a43b6f1a679 100644
--- a/driver-core-remove-dev_bin_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_bin_attrs-from-struct-class.patch
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static ssize_t dev_show(struct device *dev, struct device_attribute *attr,
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
-@@ -329,7 +329,6 @@ int subsys_virtual_register(struct bus_t
+@@ -325,7 +325,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
-@@ -358,7 +357,6 @@ struct class {
+@@ -354,7 +353,6 @@ struct class {
  
  	struct class_attribute		*class_attrs;
  	const struct attribute_group	**dev_groups;
diff --git a/hv-delete-struct-hv_dev_port_info.patch b/hv-delete-struct-hv_dev_port_info.patch
index 081e3ba7ed928c..0a728ffbcecd10 100644
--- a/hv-delete-struct-hv_dev_port_info.patch
+++ b/hv-delete-struct-hv_dev_port_info.patch
@@ -107,7 +107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  			       device_info->inbound.bytes_avail_toread);
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -429,15 +429,6 @@ struct hv_ring_buffer_info {
+@@ -432,15 +432,6 @@ struct hv_ring_buffer_info {
  	u32 ring_data_startoffset;
  };
  
@@ -123,7 +123,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /*
   *
   * hv_get_ringbuffer_availbytes()
-@@ -1166,14 +1157,6 @@ extern int vmbus_recvpacket_raw(struct v
+@@ -1169,14 +1160,6 @@ extern int vmbus_recvpacket_raw(struct v
  
  extern void vmbus_ontimer(unsigned long data);
  
diff --git a/hv-delete-vmbus_get_debug_info.patch b/hv-delete-vmbus_get_debug_info.patch
index 327805de822240..1cf47adaa2fff8 100644
--- a/hv-delete-vmbus_get_debug_info.patch
+++ b/hv-delete-vmbus_get_debug_info.patch
@@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #define VMBUS_ALIAS_LEN ((sizeof((struct hv_vmbus_device_id *)0)->guid) * 2)
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -899,11 +899,6 @@ enum vmbus_channel_state {
+@@ -902,11 +902,6 @@ enum vmbus_channel_state {
  	CHANNEL_OPENED_STATE,
  };
  
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /*
   * Represents each channel msg on the vmbus connection This is a
   * variable-size data structure depending on the msg type itself
-@@ -1169,9 +1164,6 @@ extern int vmbus_recvpacket_raw(struct v
+@@ -1172,9 +1167,6 @@ extern int vmbus_recvpacket_raw(struct v
  				     u64 *requestid);
  
  
diff --git a/hv-move-class_id-bus-attribute-to-dev_groups.patch b/hv-move-class_id-bus-attribute-to-dev_groups.patch
index 3fcfdec558aa8b..bb37fc3a6c341a 100644
--- a/hv-move-class_id-bus-attribute-to-dev_groups.patch
+++ b/hv-move-class_id-bus-attribute-to-dev_groups.patch
@@ -99,7 +99,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__ATTR(server_monitor_pending, S_IRUGO, vmbus_show_device_attr, NULL),
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,7 +900,6 @@ enum vmbus_channel_state {
+@@ -903,7 +903,6 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch b/hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch
index 201e5dbe0c720d..d23b3229bcb894 100644
--- a/hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch
+++ b/hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch
@@ -147,7 +147,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__ATTR(out_write_index, S_IRUGO, vmbus_show_device_attr, NULL),
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,9 +900,6 @@ enum vmbus_channel_state {
+@@ -903,9 +903,6 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch b/hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch
index 8cd690a47e3f16..cdc3c68540f4ab 100644
--- a/hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch
+++ b/hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch
@@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__ATTR(out_intr_mask, S_IRUGO, vmbus_show_device_attr, NULL),
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,9 +900,7 @@ enum vmbus_channel_state {
+@@ -903,9 +903,7 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch b/hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch
index b1d945309f5506..6653ba757e3fdc 100644
--- a/hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch
+++ b/hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch
@@ -158,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,10 +900,8 @@ enum vmbus_channel_state {
+@@ -903,10 +903,8 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/hv-move-device_id-bus-attribute-to-dev_groups.patch b/hv-move-device_id-bus-attribute-to-dev_groups.patch
index 1648353b41bbe9..a791450ec2a823 100644
--- a/hv-move-device_id-bus-attribute-to-dev_groups.patch
+++ b/hv-move-device_id-bus-attribute-to-dev_groups.patch
@@ -99,7 +99,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__ATTR(server_monitor_conn_id, S_IRUGO, vmbus_show_device_attr, NULL),
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,7 +900,6 @@ enum vmbus_channel_state {
+@@ -903,7 +903,6 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/hv-move-monitor_id-bus-attribute-to-dev_groups.patch b/hv-move-monitor_id-bus-attribute-to-dev_groups.patch
index ba76e2ca7a2de0..ff3121217e92c1 100644
--- a/hv-move-monitor_id-bus-attribute-to-dev_groups.patch
+++ b/hv-move-monitor_id-bus-attribute-to-dev_groups.patch
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__ATTR(server_monitor_pending, S_IRUGO, vmbus_show_device_attr, NULL),
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -902,7 +902,6 @@ enum vmbus_channel_state {
+@@ -905,7 +905,6 @@ enum vmbus_channel_state {
  struct vmbus_channel_debug_info {
  	uuid_le interfacetype;
  	uuid_le interface_instance;
diff --git a/hv-move-state-bus-attribute-to-dev_groups.patch b/hv-move-state-bus-attribute-to-dev_groups.patch
index 8b77dbbbc24650..7bcefbe85129ed 100644
--- a/hv-move-state-bus-attribute-to-dev_groups.patch
+++ b/hv-move-state-bus-attribute-to-dev_groups.patch
@@ -83,7 +83,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	__ATTR(monitor_id, S_IRUGO, vmbus_show_device_attr, NULL),
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,7 +900,6 @@ enum vmbus_channel_state {
+@@ -903,7 +903,6 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/hv-use-dev_groups-for-device-attributes.patch b/hv-use-dev_groups-for-device-attributes.patch
index 141bc857968b3e..ea77737d385830 100644
--- a/hv-use-dev_groups-for-device-attributes.patch
+++ b/hv-use-dev_groups-for-device-attributes.patch
@@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static const char *driver_name = "hyperv";
 --- a/include/linux/hyperv.h
 +++ b/include/linux/hyperv.h
-@@ -900,7 +900,6 @@ enum vmbus_channel_state {
+@@ -903,7 +903,6 @@ enum vmbus_channel_state {
  };
  
  struct vmbus_channel_debug_info {
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch
index a09cec0cc9dd11..70d2f82e71941c 100644
--- a/qlcnic_sysfs.patch
+++ b/qlcnic_sysfs.patch
@@ -141,8 +141,8 @@
  void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter)
  {
  	struct device *dev = &adapter->pdev->dev;
-@@ -1272,6 +1273,11 @@ void qlcnic_remove_sysfs_entries(struct
- void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter)
+@@ -1264,6 +1265,11 @@ void qlcnic_create_sysfs_entries(struct
+ void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter)
  {
  	struct device *dev = &adapter->pdev->dev;
 +	int err;
@@ -151,5 +151,5 @@
 +	if (err)
 +		dev_err(dev, "error creating sysfs files\n");
  
- 	if (device_create_bin_file(dev, &bin_attr_port_stats))
- 		dev_info(dev, "failed to create port stats sysfs entry");
+ 	if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_BDG)
+ 		device_remove_file(dev, &dev_attr_bridged_mode);
diff --git a/series b/series
index 458c2e4623ede6..c64be6e8948c23 100644
--- a/series
+++ b/series
@@ -3,6 +3,8 @@ serial-8250_pci-clean-up-printk-calls.patch
 serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch
 
 # patches already in my git trees, but still here so I don't loose them.
+driver-core-remove-struct-bus_type.bus_attrs.patch
+driver-core-remove-struct-bus_type.drv_attrs.patch
 
 # usb DEBUG cleanups
 
@@ -49,8 +51,6 @@ hv-delete-vmbus_get_debug_info.patch
 hv-delete-struct-hv_dev_port_info.patch
 hv-move-ringbuffer-bus-attributes-to-dev_groups.patch
 
-driver-core-remove-struct-bus_type.bus_attrs.patch
-driver-core-remove-struct-bus_type.drv_attrs.patch
 driver-core-remove-struct-bus_type.dev_attrs.patch
 
 s01.patch
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2013-10-05 18:26:56 -0700
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2013-10-05 18:26:56 -0700
commit	439aaed86577bc756086c2193f8fa23ae48d6722 (patch)
tree	89d95cc091da3c98d8dba1236349837d091adcfd
parent	e85b45737435bc1541a45058b39c25aa522cf03b (diff)
download	patches-439aaed86577bc756086c2193f8fa23ae48d6722.tar.gz