1 files changed, 0 insertions, 103 deletions
diff --git a/mmc-convert-bus-code-to-use-dev_groups.patch b/mmc-convert-bus-code-to-use-dev_groups.patch
deleted file mode 100644
index 7cd0a254a74be8..00000000000000
--- a/mmc-convert-bus-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From foo@baz Sun Oct  6 13:36:04 PDT 2013
-Date: Sun, 06 Oct 2013 13:36:04 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: MMC: 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 MMC bus code to use the
-correct field.
-
-Cc: Chris Ball <cjb@laptop.org>
-Cc: Ulf Hansson <ulf.hansson@linaro.org>
-Cc: Konstantin Dorfman <kdorfman@codeaurora.org>
-Cc: Seungwon Jeon <tgih.jun@samsung.com>
-Cc: <linux-mmc@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/mmc/core/bus.c      |   12 +++++++-----
- drivers/mmc/core/sdio_bus.c |   19 +++++++++++--------
- 2 files changed, 18 insertions(+), 13 deletions(-)
-
---- a/drivers/mmc/core/bus.c
-+++ b/drivers/mmc/core/bus.c
-@@ -27,7 +27,7 @@
- 
- #define to_mmc_driver(d)	container_of(d, struct mmc_driver, drv)
- 
--static ssize_t mmc_type_show(struct device *dev,
-+static ssize_t type_show(struct device *dev,
- 	struct device_attribute *attr, char *buf)
- {
- 	struct mmc_card *card = mmc_dev_to_card(dev);
-@@ -45,11 +45,13 @@ static ssize_t mmc_type_show(struct devi
- 		return -EFAULT;
- 	}
- }
-+static DEVICE_ATTR_RO(type);
- 
--static struct device_attribute mmc_dev_attrs[] = {
--	__ATTR(type, S_IRUGO, mmc_type_show, NULL),
--	__ATTR_NULL,
-+static struct attribute *mmc_dev_attrs[] = {
-+	&dev_attr_type.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(mmc_dev);
- 
- /*
-  * This currently matches any MMC driver to any MMC card - drivers
-@@ -218,7 +220,7 @@ static const struct dev_pm_ops mmc_bus_p
- 
- static struct bus_type mmc_bus_type = {
- 	.name		= "mmc",
--	.dev_attrs	= mmc_dev_attrs,
-+	.dev_groups	= mmc_dev_groups,
- 	.match		= mmc_bus_match,
- 	.uevent		= mmc_bus_uevent,
- 	.probe		= mmc_bus_probe,
---- a/drivers/mmc/core/sdio_bus.c
-+++ b/drivers/mmc/core/sdio_bus.c
-@@ -34,7 +34,8 @@ field##_show(struct device *dev, struct
- 									\
- 	func = dev_to_sdio_func (dev);					\
- 	return sprintf (buf, format_string, func->field);		\
--}
-+}									\
-+static DEVICE_ATTR_RO(field)
- 
- sdio_config_attr(class, "0x%02x\n");
- sdio_config_attr(vendor, "0x%04x\n");
-@@ -47,14 +48,16 @@ static ssize_t modalias_show(struct devi
- 	return sprintf(buf, "sdio:c%02Xv%04Xd%04X\n",
- 			func->class, func->vendor, func->device);
- }
-+static DEVICE_ATTR_RO(modalias);
- 
--static struct device_attribute sdio_dev_attrs[] = {
--	__ATTR_RO(class),
--	__ATTR_RO(vendor),
--	__ATTR_RO(device),
--	__ATTR_RO(modalias),
--	__ATTR_NULL,
-+static struct attribute *sdio_dev_attrs[] = {
-+	&dev_attr_class.attr,
-+	&dev_attr_vendor.attr,
-+	&dev_attr_device.attr,
-+	&dev_attr_modalias.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(sdio_dev);
- 
- static const struct sdio_device_id *sdio_match_one(struct sdio_func *func,
- 	const struct sdio_device_id *id)
-@@ -225,7 +228,7 @@ static const struct dev_pm_ops sdio_bus_
- 
- static struct bus_type sdio_bus_type = {
- 	.name		= "sdio",
--	.dev_attrs	= sdio_dev_attrs,
-+	.dev_groups	= sdio_dev_groups,
- 	.match		= sdio_bus_match,
- 	.uevent		= sdio_bus_uevent,
- 	.probe		= sdio_bus_probe,