Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Commit

Permalink
driver core: firmware_class: convert to use class_groups
Browse files Browse the repository at this point in the history
Convert the firmware core to use class_groups instead of class_attrs as
that's the correct way to handle lists of class attribute files.

Cc: Ming Lei <ming.lei@canonical.com>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Nov 29, 2016
1 parent f76d252 commit 3f214cf
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/base/firmware_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,11 +546,13 @@ static ssize_t timeout_store(struct class *class, struct class_attribute *attr,

return count;
}
static CLASS_ATTR_RW(timeout);

static struct class_attribute firmware_class_attrs[] = {
__ATTR_RW(timeout),
__ATTR_NULL
static struct attribute *firmware_class_attrs[] = {
&class_attr_timeout.attr,
NULL,
};
ATTRIBUTE_GROUPS(firmware_class);

static void fw_dev_release(struct device *dev)
{
Expand Down Expand Up @@ -585,7 +587,7 @@ static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)

static struct class firmware_class = {
.name = "firmware",
.class_attrs = firmware_class_attrs,
.class_groups = firmware_class_groups,
.dev_uevent = firmware_uevent,
.dev_release = fw_dev_release,
};
Expand Down

0 comments on commit 3f214cf

Please sign in to comment.