diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 23:58:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 23:58:52 -0700 |
| commit | f6e6720a59d48941664b57b5365cda8a8d4a3dc0 (patch) | |
| tree | 4cb4ea8ed495f917455a2c84419c04161ffc799b /mmc-convert-bus-code-to-use-dev_groups.patch | |
| parent | e58cf96361457406a7de379e6c991adae9ea169b (diff) | |
| download | patches-f6e6720a59d48941664b57b5365cda8a8d4a3dc0.tar.gz | |
rename patches that have been sent off.
Diffstat (limited to 'mmc-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | mmc-convert-bus-code-to-use-dev_groups.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/mmc-convert-bus-code-to-use-dev_groups.patch b/mmc-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..7cd0a254a74be8 --- /dev/null +++ b/mmc-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,103 @@ +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, |