refresh

3 files changed, 47 insertions, 40 deletions

diff --git a/p30.patch b/p30.patch
new file mode 100644
index 00000000000000..87dd8fcdfc87a6
--- /dev/null
+++ b/p30.patch
@@ -0,0 +1,46 @@
+---
+ drivers/uwb/lc-dev.c |   16 +++-------------
+ 1 file changed, 3 insertions(+), 13 deletions(-)
+
+--- a/drivers/uwb/lc-dev.c
++++ b/drivers/uwb/lc-dev.c
+@@ -244,7 +244,7 @@ static ssize_t uwb_dev_RSSI_store(struct
+ static DEVICE_ATTR(RSSI, S_IRUGO | S_IWUSR, uwb_dev_RSSI_show, uwb_dev_RSSI_store);
+ 
+ 
+-static struct attribute *dev_attrs[] = {
++static struct attribute *uwb_dev_attrs[] = {
+ 	&dev_attr_EUI_48.attr,
+ 	&dev_attr_DevAddr.attr,
+ 	&dev_attr_BPST.attr,
+@@ -253,20 +253,10 @@ static struct attribute *dev_attrs[] = {
+ 	&dev_attr_RSSI.attr,
+ 	NULL,
+ };
+-
+-static struct attribute_group dev_attr_group = {
+-	.attrs = dev_attrs,
+-};
+-
+-static const struct attribute_group *groups[] = {
+-	&dev_attr_group,
+-	NULL,
+-};
++ATTRIBUTE_GROUPS(uwb_dev);
+ 
+ /**
+  * Device SYSFS registration
+- *
+- *
+  */
+ static int __uwb_dev_sys_add(struct uwb_dev *uwb_dev, struct device *parent_dev)
+ {
+@@ -276,7 +266,7 @@ static int __uwb_dev_sys_add(struct uwb_
+ 	/* Device sysfs files are only useful for neighbor devices not
+ 	   local radio controllers. */
+ 	if (&uwb_dev->rc->uwb_dev != uwb_dev)
+-		dev->groups = groups;
++		dev->groups = uwb_dev_groups;
+ 	dev->parent = parent_dev;
+ 	dev_set_drvdata(dev, uwb_dev);
+ 
diff --git a/series b/series
index 4bd1ddb961d2c9..7496fcdb843e57 100644
--- a/series
+++ b/series
@@ -17,7 +17,6 @@ driver-core-remove-struct-bus_type.drv_attrs.patch
 
 # dev_groups to struct class work
 
-usb-serial-option-add-support-for-inovia-sew858-device.patch
 
 0001-Simulate-fake-Fn-key-on-PS-2-keyboards-w-o-one-eg.-C.patch
 
@@ -88,5 +87,6 @@ p27.patch
 p28.patch
 p29.patch
 
+p30.patch
 qlcnic_sysfs.patch
 
diff --git a/usb-serial-option-add-support-for-inovia-sew858-device.patch b/usb-serial-option-add-support-for-inovia-sew858-device.patch
deleted file mode 100644
index a7f684127f87c2..00000000000000
--- a/usb-serial-option-add-support-for-inovia-sew858-device.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From foo@baz Sat Oct  5 18:10:51 PDT 2013
-Date: Sat, 05 Oct 2013 18:10:51 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: [PATCH] USB: serial: option: add support for Inovia SEW858 device
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-This patch adds the device id for the Inovia SEW858 device to the option driver.
-
-Reported-by: Pavel Parkhomenko <ra85551@gmail.com>
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/option.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -451,6 +451,10 @@ static void option_instat_callback(struc
- #define CHANGHONG_VENDOR_ID			0x2077
- #define CHANGHONG_PRODUCT_CH690			0x7001
- 
-+/* Inovia */
-+#define INOVIA_VENDOR_ID			0x20a6
-+#define INOVIA_SEW858				0x1105
-+
- /* some devices interfaces need special handling due to a number of reasons */
- enum option_blacklist_reason {
- 		OPTION_BLACKLIST_NONE = 0,
-@@ -1345,6 +1349,7 @@ static const struct usb_device_id option
- 	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
- 	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
-+	{ USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
- 	{ } /* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, option_ids);