From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751588AbdAWQLl (ORCPT ); Mon, 23 Jan 2017 11:11:41 -0500 Received: from mail.kernel.org ([198.145.29.136]:42468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751569AbdAWQLk (ORCPT ); Mon, 23 Jan 2017 11:11:40 -0500 From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org Cc: ming.lei@canonical.com, keescook@chromium.org, linux-kernel-dev@beckhoff.com, jakub.kicinski@netronome.com, chris@chris-wilson.co.uk, oss-drivers@netronome.com, johannes@sipsolutions.net, j@w1.fi, teg@jklm.no, kay@vrfy.org, jwboyer@fedoraproject.org, dmitry.torokhov@gmail.com, seth.forshee@canonical.com, bjorn.andersson@linaro.org, linux-kernel@vger.kernel.org, wagi@monom.org, stephen.boyd@linaro.org, zohar@linux.vnet.ibm.com, tiwai@suse.de, dwmw2@infradead.org, fengguang.wu@intel.com, dhowells@redhat.com, arend.vanspriel@broadcom.com, kvalo@codeaurora.org, "Luis R. Rodriguez" Subject: [PATCH 2/7] test_firmware: use device attribute groups Date: Mon, 23 Jan 2017 08:11:06 -0800 Message-Id: <20170123161111.5925-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170123161111.5925-1-mcgrof@kernel.org> References: <20170118200141.GH13946@wotan.suse.de> <20170123161111.5925-1-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This simplifies init and exit. Signed-off-by: Luis R. Rodriguez --- lib/test_firmware.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 1cb9bf9eb41f..38cc188c4d3c 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -126,10 +126,21 @@ static ssize_t trigger_async_request_store(struct device *dev, } static DEVICE_ATTR_WO(trigger_async_request); +#define TEST_FW_DEV_ATTR(name) &dev_attr_##name.attr + +static struct attribute *test_dev_attrs[] = { + TEST_FW_DEV_ATTR(trigger_request), + TEST_FW_DEV_ATTR(trigger_async_request), + NULL, +}; + +ATTRIBUTE_GROUPS(test_dev); + static struct miscdevice test_fw_misc_device = { .minor = MISC_DYNAMIC_MINOR, .name = "test_firmware", .fops = &test_fw_fops, + .groups = test_dev_groups, }; static int __init test_firmware_init(void) @@ -141,30 +152,10 @@ static int __init test_firmware_init(void) pr_err("could not register misc device: %d\n", rc); return rc; } - rc = device_create_file(test_fw_misc_device.this_device, - &dev_attr_trigger_request); - if (rc) { - pr_err("could not create sysfs interface: %d\n", rc); - goto dereg; - } - - rc = device_create_file(test_fw_misc_device.this_device, - &dev_attr_trigger_async_request); - if (rc) { - pr_err("could not create async sysfs interface: %d\n", rc); - goto remove_file; - } pr_warn("interface ready\n"); return 0; - -remove_file: - device_remove_file(test_fw_misc_device.this_device, - &dev_attr_trigger_async_request); -dereg: - misc_deregister(&test_fw_misc_device); - return rc; } module_init(test_firmware_init); @@ -172,10 +163,6 @@ module_init(test_firmware_init); static void __exit test_firmware_exit(void) { release_firmware(test_firmware); - device_remove_file(test_fw_misc_device.this_device, - &dev_attr_trigger_async_request); - device_remove_file(test_fw_misc_device.this_device, - &dev_attr_trigger_request); misc_deregister(&test_fw_misc_device); pr_warn("removed interface\n"); } -- 2.11.0