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 /pnp-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 'pnp-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | pnp-convert-bus-code-to-use-dev_groups.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/pnp-convert-bus-code-to-use-dev_groups.patch b/pnp-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..b9150be474e934 --- /dev/null +++ b/pnp-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,123 @@ +From foo@baz Sun Oct 6 13:34:21 PDT 2013 +Date: Sun, 06 Oct 2013 13:34:21 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: PNP: 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 PNP bus code to use the +correct field. + +Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Cc: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/pnp/base.h | 2 +- + drivers/pnp/driver.c | 2 +- + drivers/pnp/interface.c | 43 ++++++++++++++++++++++++++----------------- + 3 files changed, 28 insertions(+), 19 deletions(-) + +--- a/drivers/pnp/base.h ++++ b/drivers/pnp/base.h +@@ -4,7 +4,7 @@ + */ + + extern spinlock_t pnp_lock; +-extern struct device_attribute pnp_interface_attrs[]; ++extern const struct attribute_group *pnp_dev_groups[]; + void *pnp_alloc(long size); + + int pnp_register_protocol(struct pnp_protocol *protocol); +--- a/drivers/pnp/driver.c ++++ b/drivers/pnp/driver.c +@@ -246,7 +246,7 @@ struct bus_type pnp_bus_type = { + .remove = pnp_device_remove, + .shutdown = pnp_device_shutdown, + .pm = &pnp_bus_dev_pm_ops, +- .dev_attrs = pnp_interface_attrs, ++ .dev_groups = pnp_dev_groups, + }; + + int pnp_register_driver(struct pnp_driver *drv) +--- a/drivers/pnp/interface.c ++++ b/drivers/pnp/interface.c +@@ -203,8 +203,8 @@ static void pnp_print_option(pnp_info_bu + } + } + +-static ssize_t pnp_show_options(struct device *dmdev, +- struct device_attribute *attr, char *buf) ++static ssize_t options_show(struct device *dmdev, struct device_attribute *attr, ++ char *buf) + { + struct pnp_dev *dev = to_pnp_dev(dmdev); + pnp_info_buffer_t *buffer; +@@ -241,10 +241,10 @@ static ssize_t pnp_show_options(struct d + kfree(buffer); + return ret; + } ++static DEVICE_ATTR_RO(options); + +-static ssize_t pnp_show_current_resources(struct device *dmdev, +- struct device_attribute *attr, +- char *buf) ++static ssize_t resources_show(struct device *dmdev, ++ struct device_attribute *attr, char *buf) + { + struct pnp_dev *dev = to_pnp_dev(dmdev); + pnp_info_buffer_t *buffer; +@@ -331,9 +331,9 @@ static char *pnp_get_resource_value(char + return buf; + } + +-static ssize_t pnp_set_current_resources(struct device *dmdev, +- struct device_attribute *attr, +- const char *ubuf, size_t count) ++static ssize_t resources_store(struct device *dmdev, ++ struct device_attribute *attr, const char *ubuf, ++ size_t count) + { + struct pnp_dev *dev = to_pnp_dev(dmdev); + char *buf = (void *)ubuf; +@@ -434,9 +434,10 @@ done: + return retval; + return count; + } ++static DEVICE_ATTR_RW(resources); + +-static ssize_t pnp_show_current_ids(struct device *dmdev, +- struct device_attribute *attr, char *buf) ++static ssize_t id_show(struct device *dmdev, struct device_attribute *attr, ++ char *buf) + { + char *str = buf; + struct pnp_dev *dev = to_pnp_dev(dmdev); +@@ -448,12 +449,20 @@ static ssize_t pnp_show_current_ids(stru + } + return (str - buf); + } ++static DEVICE_ATTR_RO(id); + +-struct device_attribute pnp_interface_attrs[] = { +- __ATTR(resources, S_IRUGO | S_IWUSR, +- pnp_show_current_resources, +- pnp_set_current_resources), +- __ATTR(options, S_IRUGO, pnp_show_options, NULL), +- __ATTR(id, S_IRUGO, pnp_show_current_ids, NULL), +- __ATTR_NULL, ++static struct attribute *pnp_dev_attrs[] = { ++ &dev_attr_resources.attr, ++ &dev_attr_options.attr, ++ &dev_attr_id.attr, ++ NULL, ++}; ++ ++static const struct attribute_group pnp_dev_group = { ++ .attrs = pnp_dev_attrs, ++}; ++ ++const struct attribute_group *pnp_dev_groups[] = { ++ &pnp_dev_group, ++ NULL, + }; |