diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
| commit | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (patch) | |
| tree | 798f5b8bfb2a5b23e49fb68002f660b694c4e672 /i2o-convert-bus-code-to-use-dev_groups.patch | |
| parent | ad2f0a874ca11c77885ea119cc80fe40c7e29eb3 (diff) | |
| download | patches-52894f7f35f3c6ad2b3362f021cdee69797d7a79.tar.gz | |
renames and a new patch
Diffstat (limited to 'i2o-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | i2o-convert-bus-code-to-use-dev_groups.patch | 109 |
1 files changed, 109 insertions, 0 deletions
diff --git a/i2o-convert-bus-code-to-use-dev_groups.patch b/i2o-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..097268b6aece3c --- /dev/null +++ b/i2o-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,109 @@ +From foo@baz Mon Oct 7 18:15:13 PDT 2013 +Date: Mon, 07 Oct 2013 18:15:13 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: i2o: 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 i2o bus code to use the +correct field. + +Cc: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/message/i2o/core.h | 2 +- + drivers/message/i2o/device.c | 32 +++++++++++++++++++++----------- + drivers/message/i2o/driver.c | 2 +- + 3 files changed, 23 insertions(+), 13 deletions(-) + +--- a/drivers/message/i2o/core.h ++++ b/drivers/message/i2o/core.h +@@ -33,7 +33,7 @@ extern int __init i2o_pci_init(void); + extern void __exit i2o_pci_exit(void); + + /* device */ +-extern struct device_attribute i2o_device_attrs[]; ++extern const struct attribute_group *i2o_device_groups[]; + + extern void i2o_device_remove(struct i2o_device *); + extern int i2o_device_parse_lct(struct i2o_controller *); +--- a/drivers/message/i2o/device.c ++++ b/drivers/message/i2o/device.c +@@ -138,45 +138,55 @@ static void i2o_device_release(struct de + } + + /** +- * i2o_device_show_class_id - Displays class id of I2O device ++ * class_id_show - Displays class id of I2O device + * @dev: device of which the class id should be displayed + * @attr: pointer to device attribute + * @buf: buffer into which the class id should be printed + * + * Returns the number of bytes which are printed into the buffer. + */ +-static ssize_t i2o_device_show_class_id(struct device *dev, +- struct device_attribute *attr, +- char *buf) ++static ssize_t class_id_show(struct device *dev, struct device_attribute *attr, ++ char *buf) + { + struct i2o_device *i2o_dev = to_i2o_device(dev); + + sprintf(buf, "0x%03x\n", i2o_dev->lct_data.class_id); + return strlen(buf) + 1; + } ++static DEVICE_ATTR_RO(class_id); + + /** +- * i2o_device_show_tid - Displays TID of I2O device ++ * tid_show - Displays TID of I2O device + * @dev: device of which the TID should be displayed + * @attr: pointer to device attribute + * @buf: buffer into which the TID should be printed + * + * Returns the number of bytes which are printed into the buffer. + */ +-static ssize_t i2o_device_show_tid(struct device *dev, +- struct device_attribute *attr, char *buf) ++static ssize_t tid_show(struct device *dev, struct device_attribute *attr, ++ char *buf) + { + struct i2o_device *i2o_dev = to_i2o_device(dev); + + sprintf(buf, "0x%03x\n", i2o_dev->lct_data.tid); + return strlen(buf) + 1; + } ++static DEVICE_ATTR_RO(tid); + + /* I2O device attributes */ +-struct device_attribute i2o_device_attrs[] = { +- __ATTR(class_id, S_IRUGO, i2o_device_show_class_id, NULL), +- __ATTR(tid, S_IRUGO, i2o_device_show_tid, NULL), +- __ATTR_NULL ++static struct attribute *i2o_device_attrs[] = { ++ &dev_attr_class_id.attr, ++ &dev_attr_tid.attr, ++ NULL, ++}; ++ ++static const struct attribute_group i2o_device_group = { ++ .attrs = i2o_device_attrs, ++}; ++ ++const struct attribute_group *i2o_device_groups[] = { ++ &i2o_device_group, ++ NULL, + }; + + /** +--- a/drivers/message/i2o/driver.c ++++ b/drivers/message/i2o/driver.c +@@ -62,7 +62,7 @@ static int i2o_bus_match(struct device * + struct bus_type i2o_bus_type = { + .name = "i2o", + .match = i2o_bus_match, +- .dev_attrs = i2o_device_attrs ++ .dev_groups = i2o_device_groups, + }; + + /** |