diff options
Diffstat (limited to 'hsi-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | hsi-convert-bus-code-to-use-dev_groups.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/hsi-convert-bus-code-to-use-dev_groups.patch b/hsi-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..5723c2eabd296b --- /dev/null +++ b/hsi-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,46 @@ +From foo@baz Sun Oct 6 23:44:02 PDT 2013 +Date: Sun, 06 Oct 2013 23:44:02 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: hsi: 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 hsi code to use the +correct field. + +Cc: Andrew Morton <akpm@linux-foundation.org> +Cc: Kees Cook <keescook@chromium.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/hsi/hsi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/hsi/hsi.c ++++ b/drivers/hsi/hsi.c +@@ -33,11 +33,13 @@ static ssize_t modalias_show(struct devi + { + return sprintf(buf, "hsi:%s\n", dev_name(dev)); + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute hsi_bus_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_NULL, ++static struct attribute *hsi_bus_dev_attrs[] = { ++ &dev_attr_modalias.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(hsi_bus_dev); + + static int hsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env) + { +@@ -53,7 +55,7 @@ static int hsi_bus_match(struct device * + + static struct bus_type hsi_bus_type = { + .name = "hsi", +- .dev_attrs = hsi_bus_dev_attrs, ++ .dev_groups = hsi_bus_dev_groups, + .match = hsi_bus_match, + .uevent = hsi_bus_uevent, + }; |