From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932856AbcK1Pm2 (ORCPT ); Mon, 28 Nov 2016 10:42:28 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:34066 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbcK1PmU (ORCPT ); Mon, 28 Nov 2016 10:42:20 -0500 Date: Mon, 28 Nov 2016 16:42:30 +0100 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Johannes Berg , Ming Lei , "Luis R. Rodriguez" Subject: [PATCH 3/3] driver core: firmware_class: convert to use class_groups Message-ID: <20161128154230.GC10427@kroah.com> References: <20161128154141.GA10427@kroah.com> <20161128154158.GB10427@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161128154158.GB10427@kroah.com> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: "Luis R. Rodriguez" Signed-off-by: Greg Kroah-Hartman --- drivers/base/firmware_class.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 22d1760a4278..98c4f28ad2a1 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -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) { @@ -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, }; -- 2.10.2