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=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 2E9EDC4338F for ; Wed, 28 Jul 2021 20:52:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14AAE6101C for ; Wed, 28 Jul 2021 20:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231697AbhG1UwI (ORCPT ); Wed, 28 Jul 2021 16:52:08 -0400 Received: from mout.gmx.net ([212.227.17.22]:52201 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231574AbhG1UwI (ORCPT ); Wed, 28 Jul 2021 16:52:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505509; bh=DhSFe+P3rPaWUNqUAqEdNMpsMXOakE4UTWSA3BpWl8A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ew8J4CKVptNsJbr/TtFwZKjNG5Bso/taGU41eJsaS9aumLKTb/aAomWhPHP8jZJjZ IpzD5TxgyjojSMsc5oiiu9UMi0DpAt8ErtJdjRGdcDiiCyu40ey4GMpxnGQPfAc7H1 jUTIL9ocJxhtUpj0a5O0xKaKTrbXOL88KVo3Kghs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mqb1c-1mv9q11UTw-00mZNh; Wed, 28 Jul 2021 22:51:49 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 1/6] hwmon: (dell-smm-hwmon) Use platform device Date: Wed, 28 Jul 2021 22:51:37 +0200 Message-Id: <20210728205142.8959-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:i9RP8SbF9BMbp0NQHIHsAzCYQ6fek7NtS9S8nVrM1zVAk58Lw/7 HMTdWBMGMFIRRv7mC6COC4T8qICfbHxmuldKs9aZumUxWGXffAbRoP4D0HKcTFopAJTfYsm a9Ux0OFEo/F/ZE0/ZJsqG8x1greI5u3yhPjmQ58SmdPU/oCZgDX7P0A+Po4TzeeiSRgllmz ggg2PK8oKgQZlziWrhJoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:sV5Za5XzprU=:7RRBaGOGd2oYF7XlsMspuQ 91kvIEejlc0EzIBIRnlKZHliLuvLBN75nNSGWB9n4KHy6aJ5ToZBj3bLSCF3GiEVNO8q1lt5R 5XcQck2tQNYQ0MD3+bDEK+TVb2T0tXuTeyYtGUU4KzW/AzWsvY2zTdvluQaaH7VTh79wo169m j+pJcPFnDP8dzAkQ5RUbacTF8mDaEzV04eV1oM46p8OgbKJ6NRftb1ZbCjWQdSr0GIBfUm4i8 OjWn8xjWNfBcR/GzSOiz9nSDs2ISdMtkTT9yAGshKLF78aGN2lwsvti172ZblAqsDs8ScupoW jeKdW8GaENbLVIyPK9VmjN5V21sdLvNDFWtDc1luIxbGnKaFanmkpx3N0SFdl2DkVB+skK6oZ qptjRuHoSnEbIE7LdzqLhyYEIC0kMjcOBBbG1c9eeo38snXKY/GhhaRG5JJrOBlrI0yGr3x5m 3PJA3hrHFcj3boL9GnNtXvysFGWMIloJQzcxRv3zd9wCND/e3Zk3XgdKUPy2XLtuQzlbIuYZg xMu1ylr0F1R1TO/868Pv/tpdNRdMuXmm9VHhK9aZVxg+IlqR0PSNVBREFQ9KvRYuoAXZTSM8J v/z6uJqExdGhUtVpLVkYzYrb1H7JiAc/bu1W1BznBlCT553ZwSu/1clzNFi6v6jsgvPy5gdwz Jc2MvLaC37CHmXby2RsAW9VPdRAgv/bc38tiVWN0bYXVDSpfzwRL9s6etImgNNMWxxuLCUsCl 8U5foPPlWytqqw0NNwGV5YWIK8WhV+OYlR+YLKoRmHTXF8UtHCh8VLYMa6vE48PHfqj2kiwh5 J1l48qRQi+Jw6CbMDC+/miU9DUOLhmG/A+zZzlJwlOqMzZko7i+Vh72AZ7o+g4vNJhR3dCAaJ PSKtGtfz/OBalP9oD7+FgPb56HA/M3LQrZ83AWR5CgVgLjCmDdk91AbBDSz41j8gqUthuzvyS VNKT6DR9V7FI+zN5cciFJb574vTLxOFQ3fbKadeaPz2v76TZCuFebJs1E3L72cP/tgwKnz5UT vkgv5wDEE2sP+ZLzM5mZDH8rqvyIrrO8a4SGjZzmfL5qG6XTdSjml7mdAKscmRZlQ4MAX89+l zSMq+84VfZG/Twq+klr4V7jIO/XsxDwcgdy Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Register a platform device for usage with devm_hwmon_device_register_with_groups since the platform device is necessary for future changes. Also fix some checkpatch warnings. Signed-off-by: Armin Wolf =2D-- drivers/hwmon/dell-smm-hwmon.c | 113 ++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 51 deletions(-) diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon= .c index f2221ca0aa7b..f06873413aea 100644 =2D-- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -14,7 +14,9 @@ #include #include +#include #include +#include #include #include #include @@ -896,7 +898,7 @@ static const struct attribute_group i8k_group =3D { }; __ATTRIBUTE_GROUPS(i8k); -static int __init i8k_init_hwmon(void) +static int __init dell_smm_init_hwmon(struct device *dev) { int err; @@ -956,15 +958,9 @@ static int __init i8k_init_hwmon(void) if (err >=3D 0) i8k_hwmon_flags |=3D I8K_HWMON_HAVE_FAN3; - i8k_hwmon_dev =3D hwmon_device_register_with_groups(NULL, "dell_smm", - NULL, i8k_groups); - if (IS_ERR(i8k_hwmon_dev)) { - err =3D PTR_ERR(i8k_hwmon_dev); - i8k_hwmon_dev =3D NULL; - pr_err("hwmon registration failed (%d)\n", err); - return err; - } - return 0; + i8k_hwmon_dev =3D devm_hwmon_device_register_with_groups(dev, "dell_smm"= , NULL, i8k_groups); + + return PTR_ERR_OR_ZERO(i8k_hwmon_dev); } struct i8k_config_data { @@ -1221,28 +1217,11 @@ static struct dmi_system_id i8k_whitelist_fan_cont= rol[] __initdata =3D { { } }; -/* - * Probe for the presence of a supported laptop. - */ -static int __init i8k_probe(void) +static int __init dell_smm_probe(struct platform_device *pdev) { const struct dmi_system_id *id, *fan_control; int fan, ret; - /* - * Get DMI information - */ - if (!dmi_check_system(i8k_dmi_table)) { - if (!ignore_dmi && !force) - return -ENODEV; - - pr_info("not running on a supported Dell system.\n"); - pr_info("vendor=3D%s, model=3D%s, version=3D%s\n", - i8k_get_dmi_data(DMI_SYS_VENDOR), - i8k_get_dmi_data(DMI_PRODUCT_NAME), - i8k_get_dmi_data(DMI_BIOS_VERSION)); - } - if (dmi_check_system(i8k_blacklist_fan_support_dmi_table)) { pr_warn("broken Dell BIOS detected, disallow fan support\n"); if (!force) @@ -1255,21 +1234,11 @@ static int __init i8k_probe(void) disallow_fan_type_call =3D true; } - strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), + strscpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version)); - strlcpy(bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), + strscpy(bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(bios_machineid)); - /* - * Get SMM Dell signature - */ - if (i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG1) && - i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG2)) { - pr_err("unable to get SMM Dell signature\n"); - if (!force) - return -ENODEV; - } - /* * Set fan multiplier and maximal fan speed from dmi config * Values specified in module parameters override values from dmi @@ -1277,6 +1246,7 @@ static int __init i8k_probe(void) id =3D dmi_first_match(i8k_dmi_table); if (id && id->driver_data) { const struct i8k_config_data *conf =3D id->driver_data; + if (!fan_mult && conf->fan_mult) fan_mult =3D conf->fan_mult; if (!fan_max && conf->fan_max) @@ -1313,29 +1283,70 @@ static int __init i8k_probe(void) i8k_fan_mult =3D fan_mult; } + ret =3D dell_smm_init_hwmon(&pdev->dev); + if (ret) + return ret; + + i8k_init_procfs(); + return 0; } +static int dell_smm_remove(struct platform_device *pdev) +{ + i8k_exit_procfs(); + + return 0; +} + +static struct platform_driver dell_smm_driver =3D { + .driver =3D { + .name =3D KBUILD_MODNAME, + }, + .remove =3D dell_smm_remove, +}; + +static struct platform_device *dell_smm_device; + +/* + * Probe for the presence of a supported laptop. + */ static int __init i8k_init(void) { - int err; + /* + * Get DMI information + */ + if (!dmi_check_system(i8k_dmi_table)) { + if (!ignore_dmi && !force) + return -ENODEV; - /* Are we running on an supported laptop? */ - if (i8k_probe()) - return -ENODEV; + pr_info("not running on a supported Dell system.\n"); + pr_info("vendor=3D%s, model=3D%s, version=3D%s\n", + i8k_get_dmi_data(DMI_SYS_VENDOR), + i8k_get_dmi_data(DMI_PRODUCT_NAME), + i8k_get_dmi_data(DMI_BIOS_VERSION)); + } - err =3D i8k_init_hwmon(); - if (err) - return err; + /* + * Get SMM Dell signature + */ + if (i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG1) && + i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG2)) { + pr_err("unable to get SMM Dell signature\n"); + if (!force) + return -ENODEV; + } - i8k_init_procfs(); - return 0; + dell_smm_device =3D platform_create_bundle(&dell_smm_driver, dell_smm_pr= obe, NULL, 0, NULL, + 0); + + return PTR_ERR_OR_ZERO(dell_smm_device); } static void __exit i8k_exit(void) { - hwmon_device_unregister(i8k_hwmon_dev); - i8k_exit_procfs(); + platform_device_unregister(dell_smm_device); + platform_driver_unregister(&dell_smm_driver); } module_init(i8k_init); =2D- 2.20.1