1 files changed, 0 insertions, 72 deletions
diff --git a/bcma-convert-bus-code-to-use-dev_groups.patch b/bcma-convert-bus-code-to-use-dev_groups.patch
deleted file mode 100644
index d5bfcb5438b56c..00000000000000
--- a/bcma-convert-bus-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From foo@baz Sun Oct  6 13:38:32 PDT 2013
-Date: Sun, 06 Oct 2013 13:38:32 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: bcma: 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 bcma bus code to use the
-correct field.
-
-Cc: Rafał Miłecki <zajec5@gmail.com>
-Cc: <linux-wireless@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/bcma/main.c |   23 ++++++++++++++++-------
- 1 file changed, 16 insertions(+), 7 deletions(-)
-
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -30,28 +30,37 @@ static ssize_t manuf_show(struct device
- 	struct bcma_device *core = container_of(dev, struct bcma_device, dev);
- 	return sprintf(buf, "0x%03X\n", core->id.manuf);
- }
-+static DEVICE_ATTR_RO(manuf);
-+
- static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf)
- {
- 	struct bcma_device *core = container_of(dev, struct bcma_device, dev);
- 	return sprintf(buf, "0x%03X\n", core->id.id);
- }
-+static DEVICE_ATTR_RO(id);
-+
- static ssize_t rev_show(struct device *dev, struct device_attribute *attr, char *buf)
- {
- 	struct bcma_device *core = container_of(dev, struct bcma_device, dev);
- 	return sprintf(buf, "0x%02X\n", core->id.rev);
- }
-+static DEVICE_ATTR_RO(rev);
-+
- static ssize_t class_show(struct device *dev, struct device_attribute *attr, char *buf)
- {
- 	struct bcma_device *core = container_of(dev, struct bcma_device, dev);
- 	return sprintf(buf, "0x%X\n", core->id.class);
- }
--static struct device_attribute bcma_device_attrs[] = {
--	__ATTR_RO(manuf),
--	__ATTR_RO(id),
--	__ATTR_RO(rev),
--	__ATTR_RO(class),
--	__ATTR_NULL,
-+static DEVICE_ATTR_RO(class);
-+
-+static struct attribute *bcma_device_attrs[] = {
-+	&dev_attr_manuf.attr,
-+	&dev_attr_id.attr,
-+	&dev_attr_rev.attr,
-+	&dev_attr_class.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(bcma_device);
- 
- static struct bus_type bcma_bus_type = {
- 	.name		= "bcma",
-@@ -59,7 +68,7 @@ static struct bus_type bcma_bus_type = {
- 	.probe		= bcma_device_probe,
- 	.remove		= bcma_device_remove,
- 	.uevent		= bcma_device_uevent,
--	.dev_attrs	= bcma_device_attrs,
-+	.dev_groups	= bcma_device_groups,
- };
- 
- static u16 bcma_cc_core_id(struct bcma_bus *bus)