From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E517FC2D0C0 for ; Mon, 23 Dec 2019 14:17:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C469521775 for ; Mon, 23 Dec 2019 14:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727355AbfLWORr (ORCPT ); Mon, 23 Dec 2019 09:17:47 -0500 Received: from mga11.intel.com ([192.55.52.93]:59438 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727189AbfLWORf (ORCPT ); Mon, 23 Dec 2019 09:17:35 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Dec 2019 06:17:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,347,1571727600"; d="scan'208";a="268164246" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 23 Dec 2019 06:17:28 -0800 Received: by black.fi.intel.com (Postfix, from userid 1001) id B52BB170C; Mon, 23 Dec 2019 16:17:18 +0200 (EET) From: Mika Westerberg To: Andy Shevchenko , Darren Hart , Lee Jones , x86@kernel.org Cc: Zha Qipeng , Rajneesh Bhardwaj , "David E . Box" , Guenter Roeck , Heikki Krogerus , Greg Kroah-Hartman , Wim Van Sebroeck , Mika Westerberg , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 36/37] mfd: intel_pmc_bxt: Switch to use driver->dev_groups Date: Mon, 23 Dec 2019 17:17:15 +0300 Message-Id: <20191223141716.13727-37-mika.westerberg@linux.intel.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191223141716.13727-1-mika.westerberg@linux.intel.com> References: <20191223141716.13727-1-mika.westerberg@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver core provides support for adding additional attributes for devices via new ->dev_groups member of struct device_driver. Convert the driver to use that instead of adding the attributes manually. Suggested-by: Andy Shevchenko Signed-off-by: Mika Westerberg --- drivers/mfd/intel_pmc_bxt.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/mfd/intel_pmc_bxt.c b/drivers/mfd/intel_pmc_bxt.c index 1591e4ecf5e5..ff3f6cd63531 100644 --- a/drivers/mfd/intel_pmc_bxt.c +++ b/drivers/mfd/intel_pmc_bxt.c @@ -244,6 +244,11 @@ static const struct attribute_group intel_pmc_group = { .attrs = intel_pmc_attrs, }; +static const struct attribute_group *intel_pmc_groups[] = { + &intel_pmc_group, + NULL, +}; + static int pmc_create_punit_device(void) { struct mfd_cell punit = { @@ -492,27 +497,14 @@ static int intel_pmc_probe(struct platform_device *pdev) ret = pmc_create_devices(); if (ret) { dev_err(&pdev->dev, "Failed to create pmc devices\n"); - goto err_ipc; - } - - ret = sysfs_create_group(&pdev->dev.kobj, &intel_pmc_group); - if (ret) { - dev_err(&pdev->dev, "Failed to create sysfs group %d\n", - ret); - goto err_ipc; + intel_scu_ipc_remove(scu); } - return 0; - -err_ipc: - intel_scu_ipc_remove(scu); - return ret; } static int intel_pmc_remove(struct platform_device *pdev) { - sysfs_remove_group(&pdev->dev.kobj, &intel_pmc_group); intel_scu_ipc_remove(platform_get_drvdata(pdev)); pmcdev.dev = NULL; return 0; @@ -524,6 +516,7 @@ static struct platform_driver intel_pmc_driver = { .driver = { .name = "intel_pmc_bxt", .acpi_match_table = ACPI_PTR(intel_pmc_acpi_ids), + .dev_groups = intel_pmc_groups, }, }; -- 2.24.0