diff options
Diffstat (limited to 'scsi-fcoe-convert-bus-code-to-use-bus_groups.patch')
| -rw-r--r-- | scsi-fcoe-convert-bus-code-to-use-bus_groups.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/scsi-fcoe-convert-bus-code-to-use-bus_groups.patch b/scsi-fcoe-convert-bus-code-to-use-bus_groups.patch new file mode 100644 index 00000000000000..5c8d4bf355d135 --- /dev/null +++ b/scsi-fcoe-convert-bus-code-to-use-bus_groups.patch @@ -0,0 +1,46 @@ +From foo@baz Fri Aug 23 13:21:55 PDT 2013 +Date: Fri, 23 Aug 2013 13:21:55 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: SCSI: fcoe: convert bus code to use bus_groups + +The bus_attrs field of struct bus_type is going away soon, dev_groups +should be used instead. This converts the fcoe bus code to use the +correct field. + +Cc: Robert Love <robert.w.love@intel.com> +Cc: "James E.J. Bottomley" <JBottomley@parallels.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/scsi/fcoe/fcoe_sysfs.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +--- a/drivers/scsi/fcoe/fcoe_sysfs.c ++++ b/drivers/scsi/fcoe/fcoe_sysfs.c +@@ -553,16 +553,20 @@ static struct device_type fcoe_fcf_devic + .release = fcoe_fcf_device_release, + }; + +-static struct bus_attribute fcoe_bus_attr_group[] = { +- __ATTR(ctlr_create, S_IWUSR, NULL, fcoe_ctlr_create_store), +- __ATTR(ctlr_destroy, S_IWUSR, NULL, fcoe_ctlr_destroy_store), +- __ATTR_NULL ++static BUS_ATTR(ctlr_create, S_IWUSR, NULL, fcoe_ctlr_create_store); ++static BUS_ATTR(ctlr_destroy, S_IWUSR, NULL, fcoe_ctlr_destroy_store); ++ ++static struct attribute *fcoe_bus_attrs[] = { ++ &bus_attr_ctlr_create.attr, ++ &bus_attr_ctrl_destroy.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(fcoe_bus); + + static struct bus_type fcoe_bus_type = { + .name = "fcoe", + .match = &fcoe_bus_match, +- .bus_attrs = fcoe_bus_attr_group, ++ .bus_groups = fcoe_bus_groups, + }; + + /** |