From patchwork Sat May 15 18:34:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12259947 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 F1F34C433B4 for ; Sat, 15 May 2021 18:34:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CACF46135F for ; Sat, 15 May 2021 18:34:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234411AbhEOSfv (ORCPT ); Sat, 15 May 2021 14:35:51 -0400 Received: from mout.gmx.net ([212.227.17.22]:44417 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234129AbhEOSfv (ORCPT ); Sat, 15 May 2021 14:35:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621103661; bh=Dh1HU2MdA+gtF4CNqSTD69H2JwWYXx90rbg56VXs4t4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jAYp6M2HUfMKC0dl6AJPAKJ/n3D2FK96tPhLBUEuHJkX/5YTnfO8MtHd6HscUSO8G GRZtsYB4Ph1WNyU5U+Z7tRdSmE2BhWXx2iCfqKDWkMg0/VMvJgCZu247KIqUQV2hx4 SYFrpCgJ8wEgEER+VHsbCNzfoMboVV6SCQUDNoVc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.0.97.49]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MY68T-1lyqlk14A9-00YS43; Sat, 15 May 2021 20:34:21 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [RFC 1/3] hwmon: (dell-smm-hwmon) Use platform device Date: Sat, 15 May 2021 20:34:07 +0200 Message-Id: <20210515183409.682-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210515183409.682-1-W_Armin@gmx.de> References: <20210515183409.682-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:rJSNanD7SfvVDSryuYW0qA1Stxoe9bDgGtK3RCsmcDHmlsDtWF1 4zMPjCjfOtOSxgsgdgm11RFcjSXm5bF0WzHdUO0MZvMbCsIUXcQYXoW22Q3QNTJ3TBOWvYa iGq+wGuBw7WwHK7W+H3D/9sxZDLUM4sxyyA3X0aNLo5YrQ7Bk1j2x30CRZxecfBziHr2BUn PFwgRwZboob1geDO2VEQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:GXPtlEChAQ4=:+6miaxXnWjniv9PXq6G7e0 6/mcBJlpHnU06WgBj28W9iWlz58fA7I/vldzVt5Btf8o6vnTQa+a/xvnN/1RxRp2ksBe9KOLj peIZGkSFEAR+RASV8ifhxPI5Zv1hdA7hlRif06Jcd8I71ifeQe0IOZ69wp/BMsdGaiBgBhuFM QIG/JBhwU11mwJ90wsxi94Mn54WfOGQxgNdHGav0LtuoKSJ48zQTExIuYi5RH+LB84vIcRLjk JTdfw1AAEeyVKRbUPSSOU8fK2YSvFIz+47+Z6Ne9Ceh+0p9YfC5aseOiOiSyig8j1d93yJbcs 3gWDL9lAlqCVJs2pWCna67S6mOeK2D2ht4yIhJk0v9D0hW5gsqt2l8wXzq6q/DRRJsgD1ht58 9LB1qgalWZ+3A7y1FltpCfCZaXUtnsvlYkwbcJZId/C6i7UrFsOkB4EbgauU5GRkLzsQXhhgi lFpgmresAxaDk4G24n54RWL51rkwNwUQB+oWup60PMp/hWM1I1iaK5eou4isZXHipG+86NKzg Jr8XhewIG/sDGpSryhzDECt0ViaXuivaZ6uwuDNH3QcWUFO5YH9TbHhhWWxI0qtGVUFy4ivgu WE9FwamZ1Jz1+oIW4gzw+laANv3yZBAcg2aG1pPF3lC9UKcwilSbFAHjSyZWz4qccE52uvBUf sYK2z6MUTiwH8f7fzIK/fq+1Qc2QwLUtgqFYJ/KztgmixCnPnU6VX6MzJTob0qYgCplQPhQMw ebMkRkelhEjYHDNcFt1tpMB0bCLl/aE24SXNrZtMnDtYk8Vs6UtsOVaKAqkp2WV2aRPdVbwln yNEdR+KYw/NSoVZuAcKv2pk8u4uf23caIyV0NXmtMzL8i3u3m8PTtVKq4cvSeGIYRmrF7WOLD wc3Kuc89sQgyorjVGis0cAZF0Gj4HcND761FKV/8Uzel15CyBSTT5oqDiV7LpmN8QdFYiDoEB o5uaUfE5J6n0y+SIGh5zr3Xt3icwuTQ0k6W7qeT9xT+ZJd92EsDFzjqOvcbs3YHlwzPPCWBfT Iie4rJ3kYegqgjybXEcFC3YzvluMZ9kOZG5l6Ed6fByovmi2Zo83RT4BOgdmszLnc1D9YsysW wlx4qQkrxL5ATE4NUccBkLET90AAiPEoPLP8JpKvcskg6hg8cI/Go/yDXX3YcbP9jJ96MpHmd mNJWAnryph7OBBDOGjS1U2BzCimb1foIZKV+L5Ic1BTOf0WjJadDYDoMAPtgw5NcxonNg= 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. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 70 ++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 29 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index f2221ca0aa7b..006d435a6e78 100644 --- 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 = { }; __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 >= 0) i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; - i8k_hwmon_dev = hwmon_device_register_with_groups(NULL, "dell_smm", - NULL, i8k_groups); - if (IS_ERR(i8k_hwmon_dev)) { - err = PTR_ERR(i8k_hwmon_dev); - i8k_hwmon_dev = NULL; - pr_err("hwmon registration failed (%d)\n", err); - return err; - } - return 0; + i8k_hwmon_dev = 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,10 +1217,39 @@ static struct dmi_system_id i8k_whitelist_fan_control[] __initdata = { { } }; +static int __init dell_smm_probe(struct platform_device *pdev) +{ + int err; + + err = dell_smm_init_hwmon(&pdev->dev); + if (err) + return err; + + 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 = { + .driver = { + .name = KBUILD_MODNAME, + }, + .remove = dell_smm_remove, +}; + +static struct platform_device *dell_smm_device; + /* * Probe for the presence of a supported laptop. */ -static int __init i8k_probe(void) +static int __init i8k_init(void) { const struct dmi_system_id *id, *fan_control; int fan, ret; @@ -1313,29 +1338,16 @@ static int __init i8k_probe(void) i8k_fan_mult = fan_mult; } - return 0; -} - -static int __init i8k_init(void) -{ - int err; - - /* Are we running on an supported laptop? */ - if (i8k_probe()) - return -ENODEV; - - err = i8k_init_hwmon(); - if (err) - return err; + dell_smm_device = platform_create_bundle(&dell_smm_driver, dell_smm_probe, NULL, 0, NULL, + 0); - i8k_init_procfs(); - return 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); From patchwork Sat May 15 18:34:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12259949 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 7D475C43460 for ; Sat, 15 May 2021 18:34:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F45061369 for ; Sat, 15 May 2021 18:34:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234129AbhEOSfx (ORCPT ); Sat, 15 May 2021 14:35:53 -0400 Received: from mout.gmx.net ([212.227.17.22]:54295 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231558AbhEOSfw (ORCPT ); Sat, 15 May 2021 14:35:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621103662; bh=LCPbuxPfoo/X8OzcRiHQd+iDxgWjqCjOolPjT/aWUNY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Q4vvkFz2Il4Mka9Gp71SjVCiA019SrjFQwkEVF2u2ZPLBLPsanPD3SiVmoAml5XKY sbiCJlMBdC7wxyFT/2oNZmheSLY6prm68Eu5aaB42pBm+RVHEvujdlKaM8OeNyWCc3 DrYugHrC01FXeeWjV3FHTLFuJzfLdAJCzixv/L1M= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.0.97.49]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MEm27-1lgdfB2pAJ-00GDxG; Sat, 15 May 2021 20:34:22 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [RFC 2/3] hwmon: (dell-smm-hwmon) Use devm_add_action_or_reset() Date: Sat, 15 May 2021 20:34:08 +0200 Message-Id: <20210515183409.682-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210515183409.682-1-W_Armin@gmx.de> References: <20210515183409.682-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:08lpIZGLDJ6CvsP3i3ZEMISs7i0oC3sns7xMLq0xCzwJayCvxKe hQB/tX1bi/lb45z8BPW85Enmwp4yCgWSKdgZMpXXtww3v4nH63gXcuo+hs3AaKJBo1Gmfji IIY31npOlOnPOlriEL3RViKfeQGeXCLduc+ZSSrIYgHACNovu/twhYayk4ivoxjbNRrfNHv bgzPqhwO9IH4HEZXw1pFQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:bjEF+YKwNFg=:PcfSh+M2BySZIujU5sgxch A5/b2DGwPyor9ia1DST0erFD0ILuuv1P7JC2xnLPgZZaWMR7WAd4vb6XKAEnTyWSP5b3UTvfu bED6bsMsQQMkyc3wPHUs1P3PdrwlBX3kXhdqb/M8FWuyed6KZfT2Y/r48sJGIDtsz1bpn+HFQ lR7gh+ak31BRh4KRw3QhfTrDlItp5lTy0Aeuw6PqqK9lf634xEgR4BsFsckkwi/8M/afQJtqC p9KF65sa8W1axUPiZoDiuMYSSSPgitCww9t4SNyefM8Ii13HS7wNmbQtGKqDve7r2i3SqRFUr +/QEh4nf5EsNJbmwZKjOhnq8kKDsD94iP81v4fkKvn/hMpLL2UH289y6k5cBpzQIFlmhzsCZm vCiV8P1iF/ZxxIcYDStb2wVpat5urP0cFd7NtIIPAyQ6D1vQ4FIZW3QFCw6wyMhIza7rlyyCt zXpSwTYOxUigkbx8wOPBNpAT47QeOFOI/d0WA+RGiqumZNCzo7YXPcadb+54WBOerNOuRJLxa gjgj6R8750JoEbFzv6aSQS4VT17BrFdAgOgi+Oqbxwvdoqk+w+02TGrtkIrxlsDiEActRLkS5 UX5XDfNJmN5P6dz+HjsqfwQ1+vDg3Jj1bWDFvOfIzN3IwevU9lgNKTRIP7kp80UgGnY/kmpCW xuTaDj55/p5UpOvyjSzbAFyr9CqCkQ+9+uSHaYGp9IH8FqNvUolymdHUJwVMs2wF7+NGKMpGM wIFjqhknAb9Nr9HBb5k3FAttn85D4e2TirkHA/8pPE465T8x0UIbEQavY4PQLbgfJpk+EEXoZ WOFCZXFkkcv50lP+j95+S3sKPQ2E+dUIYaISW5x70rtmHd8tQk3rgxs9tzTKqgKuSvG2PJdwY AAHvjACEa/WkmjKipbqClnsVGvtgD8EEm3uHGucYwPpBeOaJzEVqEVU4ga81uikzjW1Ck2O5C rjr9AMETgIHpSY+lYOj5J23nhpiwicSDUS5b3dToGx0OohtuTB7gsYin0IlTwwas1iOHl82fy Xq8w+sAAEwbVx1G2ERZhVxC/n75R4APNyHmXlWnEXmlqV8WmX0L7v6jt+xafAzoYcpKemmLtH LwF7cPlwPsj27wJByDJi+H/SXesNC5Okk/+rQI4/gEw5jd+mU8wbjUGMBth0ggFMHGDSnkWhI i95rx09pyuK5HdMjAbqFXq3lwNTuIMbjfIajP9xI9pFxujILu8y/nLip/bNk+/XaiyjXY= Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Use devm_add_action_or_reset() for calling i8k_exit_procfs() for omitting the remove() function in dell_smm_driver. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 006d435a6e78..6f9bc2691491 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -605,24 +605,22 @@ static const struct proc_ops i8k_proc_ops = { .proc_ioctl = i8k_ioctl, }; -static void __init i8k_init_procfs(void) +static void i8k_exit_procfs(void *param) { - /* Register the proc entry */ - proc_create("i8k", 0, NULL, &i8k_proc_ops); + remove_proc_entry("i8k", NULL); } -static void __exit i8k_exit_procfs(void) +static void __init i8k_init_procfs(struct device *dev) { - remove_proc_entry("i8k", NULL); + /* Register the proc entry */ + proc_create("i8k", 0, NULL, &i8k_proc_ops); + + devm_add_action_or_reset(dev, i8k_exit_procfs, NULL); } #else -static inline void __init i8k_init_procfs(void) -{ -} - -static inline void __exit i8k_exit_procfs(void) +static void __init i8k_init_procfs(struct device *dev) { } @@ -1225,14 +1223,7 @@ static int __init dell_smm_probe(struct platform_device *pdev) if (err) return err; - i8k_init_procfs(); - - return 0; -} - -static int dell_smm_remove(struct platform_device *pdev) -{ - i8k_exit_procfs(); + i8k_init_procfs(&pdev->dev); return 0; } @@ -1241,7 +1232,6 @@ static struct platform_driver dell_smm_driver = { .driver = { .name = KBUILD_MODNAME, }, - .remove = dell_smm_remove, }; static struct platform_device *dell_smm_device; From patchwork Sat May 15 18:34:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12259951 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 5C199C433ED for ; Sat, 15 May 2021 18:34:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A11B61264 for ; Sat, 15 May 2021 18:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234438AbhEOSf6 (ORCPT ); Sat, 15 May 2021 14:35:58 -0400 Received: from mout.gmx.net ([212.227.17.20]:54619 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231558AbhEOSf5 (ORCPT ); Sat, 15 May 2021 14:35:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621103664; bh=aCoUcfBzXhegEZrNZbGZLApxB1Mg3x2frvGtIOAW9UE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=lobVwLEgx7ZgjofM+BEpntq2gePz3jR8+LI+BdoEHU/XdCT8YGAzVytcmld3TU+e7 MlbeeEdt0tPJyTpZFSNTIpZpyQGRG6wCouDGXFzh2xt1+hCLUTVxE3Gs+HwCzs/2zg rNrPxhrHa1wOGNC/Syje7aZQt5wdfdUQ/xRMUvPM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.0.97.49]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mof9F-1l71j70nOb-00p5VU; Sat, 15 May 2021 20:34:24 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [RFC 3/3] hwmon: (dell-smm-hwmon) Move variables into a driver private data structure Date: Sat, 15 May 2021 20:34:09 +0200 Message-Id: <20210515183409.682-4-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210515183409.682-1-W_Armin@gmx.de> References: <20210515183409.682-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:l4SFtr6UNMh7nQD9uJ5XjZNoODO7AgHBAHgAjsFcZJO6oTVLD3m D9cXYl9vlhWwryHl1qL3Z87J5aixtyA1i/Jbm+pv1qpK+HjxYIy3KOy0AIJ+wYWEv5NCgNG f90h1qaXncyD7oXS/vmVnWZGxfZsvZ71RnSv4olOApkqpXC5BvPcOeFrezf92d6KDQDoVs5 Ph1h7aTDPIOoMSB4ir/Qw== X-UI-Out-Filterresults: notjunk:1;V03:K0:vIEnYH8YUrI=:r0PxFmDD6ilg4F7rporLXy lcYLyJktqQHvVplYAWFiEM7l+wgugllPRQpLt0l3/HKMTUqRs2KovS7Ezd860V00zyWD423aF 88tJZkzsgmmKSpmOyMSomsOOg2sc/I5NpB4drksidpz9gPiCIT8RDPMsAEVr9yaUqnvpjvPav fTm0Tqbg+WI5HhxQAkQmFMFmrKpnJXpjBfZYs1sSOpDtMnCBsApXqmWm0myQG5/mAepdQrYSI hOP3wkvaRTTX9AfJjmFmJkSGkgjhzHj08T1VYZjj6EWLOQVVL4E3GecIUEYCJnXOoSa7sTngr n5qcmwIQ8dTRPAPMr1HUWhdtBPCZe5I9CLgLOM7teN+ZWaVQPxYZy3HB1G//ER+wCgWOIV3+J fMEjAms0MNH8e/gDSxXiN0CdzlsQzLeInNGp8Sam+rfSZx86gH/UYohmxqVkEu89F2Xv8eQRv 1DowDk9kGuVFHj5Z2fPmnF+5qFy/bCwjNt7vASuxvGHMu3EhazOlS+7iJa2nMVsZRz9+q+iQE pWC+pBh4e+wzmZRKjk+BpG260SZxYEwsVO75OnkNhRh2OTEYIM9GK510lPQYif29ws/wbbvSK CzeC0+uxBosMRPKCJbCUqYTBNqYeD8Jv+PPNM9Ps00PLMypIGUdtolS7gdyuxQ3iLSld2cdE3 TPdlReQttnBeh6zH8CSx2BP+e9zoUfUYF2vquC/D3lzYy3r13MUozBq97vmqoVjK7ajYtU/gE 6J74mcEI+KlL/ZXobdh58FpqqNjHFGAP1VYk2YDSFzy8Ut54hRfc3114DMbgRPyhn5Zo8iRht 2mCBN9myZn3T/oaVW3wE0wKcWb7wUr+zMvmIlo1RQkr1uRdE0BcoEw1HXmq4zSyNuX7v/rSmc Db7bgpMWuPa737l1ehS8XH/nM4ung9u5VSE9DOzN+708eoHUJQH0hNa9CjDlMCvPbGfuGDF5r wezhrMLoDPoPsjQuM77pR16u43xhVJxKELCmfCK0FRQftztHW1+dSLtriZtwAsuFxG0J6ZNnL GK20dK43vXyfCLuGVqL5YKQLsOr5K4NzkY16nRRX8ek2lJ6Y7TIv+qiC58Zf/udE1X9n0DFYA p9lfqr+b3XhFBrVxRY+rRvvSlg1EilEjmfnb2l4/zxN6Yb+u3vLtA+8bcpaOiC9Sf4fO9SlkS TRpuQg9p4kEMnQlrQPAOplE3pr/Q3kjlHPG+vT1jpeGP1nlJUamiAqwUAbh9i0vi5b1j0= Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Move Variables into a driver private data structure. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 370 ++++++++++++++++++--------------- 1 file changed, 198 insertions(+), 172 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 6f9bc2691491..3a4cf83ee267 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -60,18 +60,20 @@ #define I8K_POWER_AC 0x05 #define I8K_POWER_BATTERY 0x01 -static DEFINE_MUTEX(i8k_mutex); -static char bios_version[4]; -static char bios_machineid[16]; -static struct device *i8k_hwmon_dev; -static u32 i8k_hwmon_flags; -static uint i8k_fan_mult = I8K_FAN_MULT; -static uint i8k_pwm_mult; -static uint i8k_fan_max = I8K_FAN_HIGH; -static bool disallow_fan_type_call; -static bool disallow_fan_support; -static unsigned int manual_fan; -static unsigned int auto_fan; +struct dell_smm_data { + struct mutex i8k_mutex; /* lock for sensors writes */ + char bios_version[4]; + char bios_machineid[16]; + u32 i8k_hwmon_flags; + uint i8k_fan_mult; + uint i8k_pwm_mult; + uint i8k_fan_max; + bool disallow_fan_type_call; + bool disallow_fan_support; + unsigned int manual_fan; + unsigned int auto_fan; + int types[3]; +}; #define I8K_HWMON_HAVE_TEMP1 (1 << 0) #define I8K_HWMON_HAVE_TEMP2 (1 << 1) @@ -240,11 +242,11 @@ static int i8k_smm(struct smm_regs *regs) /* * Read the fan status. */ -static int i8k_get_fan_status(int fan) +static int i8k_get_fan_status(struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_FAN, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; regs.ebx = fan & 0xff; @@ -254,84 +256,82 @@ static int i8k_get_fan_status(int fan) /* * Read the fan speed in RPM. */ -static int i8k_get_fan_speed(int fan) +static int i8k_get_fan_speed(struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_SPEED, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; regs.ebx = fan & 0xff; - return i8k_smm(®s) ? : (regs.eax & 0xffff) * i8k_fan_mult; + return i8k_smm(®s) ? : (regs.eax & 0xffff) * data->i8k_fan_mult; } /* * Read the fan type. */ -static int _i8k_get_fan_type(int fan) +static int _i8k_get_fan_type(struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_FAN_TYPE, }; - if (disallow_fan_support || disallow_fan_type_call) + if (data->disallow_fan_support || data->disallow_fan_type_call) return -EINVAL; regs.ebx = fan & 0xff; return i8k_smm(®s) ? : regs.eax & 0xff; } -static int i8k_get_fan_type(int fan) +static int i8k_get_fan_type(struct dell_smm_data *data, int fan) { /* I8K_SMM_GET_FAN_TYPE SMM call is expensive, so cache values */ - static int types[3] = { INT_MIN, INT_MIN, INT_MIN }; - - if (types[fan] == INT_MIN) - types[fan] = _i8k_get_fan_type(fan); + if (data->types[fan] == INT_MIN) + data->types[fan] = _i8k_get_fan_type(data, fan); - return types[fan]; + return data->types[fan]; } /* * Read the fan nominal rpm for specific fan speed. */ -static int i8k_get_fan_nominal_speed(int fan, int speed) +static int i8k_get_fan_nominal_speed(struct dell_smm_data *data, int fan, int speed) { struct smm_regs regs = { .eax = I8K_SMM_GET_NOM_SPEED, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; regs.ebx = (fan & 0xff) | (speed << 8); - return i8k_smm(®s) ? : (regs.eax & 0xffff) * i8k_fan_mult; + return i8k_smm(®s) ? : (regs.eax & 0xffff) * data->i8k_fan_mult; } /* * Enable or disable automatic BIOS fan control support */ -static int i8k_enable_fan_auto_mode(bool enable) +static int i8k_enable_fan_auto_mode(struct dell_smm_data *data, bool enable) { struct smm_regs regs = { }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; - regs.eax = enable ? auto_fan : manual_fan; + regs.eax = enable ? data->auto_fan : data->manual_fan; return i8k_smm(®s); } /* * Set the fan speed (off, low, high). Returns the new fan status. */ -static int i8k_set_fan(int fan, int speed) +static int i8k_set_fan(struct dell_smm_data *data, int fan, int speed) { struct smm_regs regs = { .eax = I8K_SMM_SET_FAN, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; - speed = (speed < 0) ? 0 : ((speed > i8k_fan_max) ? i8k_fan_max : speed); + speed = (speed < 0) ? 0 : ((speed > data->i8k_fan_max) ? data->i8k_fan_max : speed); regs.ebx = (fan & 0xff) | (speed << 8); - return i8k_smm(®s) ? : i8k_get_fan_status(fan); + return i8k_smm(®s) ? : i8k_get_fan_status(data, fan); } static int i8k_get_temp_type(int sensor) @@ -442,7 +442,7 @@ static int i8k_get_power_status(void) */ static int -i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) +i8k_ioctl_unlocked(struct file *fp, struct dell_smm_data *data, unsigned int cmd, unsigned long arg) { int val = 0; int speed; @@ -454,12 +454,12 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) switch (cmd) { case I8K_BIOS_VERSION: - if (!isdigit(bios_version[0]) || !isdigit(bios_version[1]) || - !isdigit(bios_version[2])) + if (!isdigit(data->bios_version[0]) || !isdigit(data->bios_version[1]) || + !isdigit(data->bios_version[2])) return -EINVAL; - val = (bios_version[0] << 16) | - (bios_version[1] << 8) | bios_version[2]; + val = (data->bios_version[0] << 16) | + (data->bios_version[1] << 8) | data->bios_version[2]; break; case I8K_MACHINE_ID: @@ -467,7 +467,7 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) return -EPERM; memset(buff, 0, sizeof(buff)); - strlcpy(buff, bios_machineid, sizeof(buff)); + strscpy(buff, data->bios_machineid, sizeof(buff)); break; case I8K_FN_STATUS: @@ -486,14 +486,14 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) if (copy_from_user(&val, argp, sizeof(int))) return -EFAULT; - val = i8k_get_fan_speed(val); + val = i8k_get_fan_speed(data, val); break; case I8K_GET_FAN: if (copy_from_user(&val, argp, sizeof(int))) return -EFAULT; - val = i8k_get_fan_status(val); + val = i8k_get_fan_status(data, val); break; case I8K_SET_FAN: @@ -506,7 +506,7 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) if (copy_from_user(&speed, argp + 1, sizeof(int))) return -EFAULT; - val = i8k_set_fan(val, speed); + val = i8k_set_fan(data, val, speed); break; default: @@ -539,11 +539,12 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) { + struct dell_smm_data *data = PDE_DATA(file_inode(fp)); long ret; - mutex_lock(&i8k_mutex); - ret = i8k_ioctl_unlocked(fp, cmd, arg); - mutex_unlock(&i8k_mutex); + mutex_lock(&data->i8k_mutex); + ret = i8k_ioctl_unlocked(fp, data, cmd, arg); + mutex_unlock(&data->i8k_mutex); return ret; } @@ -553,17 +554,18 @@ static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) */ static int i8k_proc_show(struct seq_file *seq, void *offset) { + struct dell_smm_data *data = seq->private; int fn_key, cpu_temp, ac_power; int left_fan, right_fan, left_speed, right_speed; - cpu_temp = i8k_get_temp(0); /* 11100 µs */ - left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 µs */ - right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 µs */ - left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 µs */ - right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 µs */ - fn_key = i8k_get_fn_status(); /* 750 µs */ + cpu_temp = i8k_get_temp(0); /* 11100 µs */ + left_fan = i8k_get_fan_status(data, I8K_FAN_LEFT); /* 580 µs */ + right_fan = i8k_get_fan_status(data, I8K_FAN_RIGHT); /* 580 µs */ + left_speed = i8k_get_fan_speed(data, I8K_FAN_LEFT); /* 580 µs */ + right_speed = i8k_get_fan_speed(data, I8K_FAN_RIGHT); /* 580 µs */ + fn_key = i8k_get_fn_status(); /* 750 µs */ if (power_status) - ac_power = i8k_get_power_status(); /* 14700 µs */ + ac_power = i8k_get_power_status(); /* 14700 µs */ else ac_power = -1; @@ -583,8 +585,8 @@ static int i8k_proc_show(struct seq_file *seq, void *offset) */ seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n", I8K_PROC_FMT, - bios_version, - (restricted && !capable(CAP_SYS_ADMIN)) ? "-1" : bios_machineid, + data->bios_version, + (restricted && !capable(CAP_SYS_ADMIN)) ? "-1" : data->bios_machineid, cpu_temp, left_fan, right_fan, left_speed, right_speed, ac_power, fn_key); @@ -594,7 +596,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset) static int i8k_open_fs(struct inode *inode, struct file *file) { - return single_open(file, i8k_proc_show, NULL); + return single_open(file, i8k_proc_show, PDE_DATA(inode)); } static const struct proc_ops i8k_proc_ops = { @@ -612,8 +614,10 @@ static void i8k_exit_procfs(void *param) static void __init i8k_init_procfs(struct device *dev) { + struct dell_smm_data *data = dev_get_drvdata(dev); + /* Register the proc entry */ - proc_create("i8k", 0, NULL, &i8k_proc_ops); + proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data); devm_add_action_or_reset(dev, i8k_exit_procfs, NULL); } @@ -670,6 +674,7 @@ static ssize_t i8k_hwmon_fan_label_show(struct device *dev, struct device_attribute *devattr, char *buf) { + struct dell_smm_data *data = dev_get_drvdata(dev); static const char * const labels[] = { "Processor Fan", "Motherboard Fan", @@ -682,7 +687,7 @@ static ssize_t i8k_hwmon_fan_label_show(struct device *dev, bool dock = false; int type; - type = i8k_get_fan_type(index); + type = i8k_get_fan_type(data, index); if (type < 0) return type; @@ -700,10 +705,11 @@ static ssize_t i8k_hwmon_fan_label_show(struct device *dev, static ssize_t i8k_hwmon_fan_show(struct device *dev, struct device_attribute *devattr, char *buf) { + struct dell_smm_data *data = dev_get_drvdata(dev); int index = to_sensor_dev_attr(devattr)->index; int fan_speed; - fan_speed = i8k_get_fan_speed(index); + fan_speed = i8k_get_fan_speed(data, index); if (fan_speed < 0) return fan_speed; return sprintf(buf, "%d\n", fan_speed); @@ -712,19 +718,21 @@ static ssize_t i8k_hwmon_fan_show(struct device *dev, static ssize_t i8k_hwmon_pwm_show(struct device *dev, struct device_attribute *devattr, char *buf) { + struct dell_smm_data *data = dev_get_drvdata(dev); int index = to_sensor_dev_attr(devattr)->index; int status; - status = i8k_get_fan_status(index); + status = i8k_get_fan_status(data, index); if (status < 0) return -EIO; - return sprintf(buf, "%d\n", clamp_val(status * i8k_pwm_mult, 0, 255)); + return sprintf(buf, "%d\n", clamp_val(status * data->i8k_pwm_mult, 0, 255)); } static ssize_t i8k_hwmon_pwm_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + struct dell_smm_data *data = dev_get_drvdata(dev); int index = to_sensor_dev_attr(attr)->index; unsigned long val; int err; @@ -732,11 +740,11 @@ static ssize_t i8k_hwmon_pwm_store(struct device *dev, err = kstrtoul(buf, 10, &val); if (err) return err; - val = clamp_val(DIV_ROUND_CLOSEST(val, i8k_pwm_mult), 0, i8k_fan_max); + val = clamp_val(DIV_ROUND_CLOSEST(val, data->i8k_pwm_mult), 0, data->i8k_fan_max); - mutex_lock(&i8k_mutex); - err = i8k_set_fan(index, val); - mutex_unlock(&i8k_mutex); + mutex_lock(&data->i8k_mutex); + err = i8k_set_fan(data, index, val); + mutex_unlock(&data->i8k_mutex); return err < 0 ? -EIO : count; } @@ -745,11 +753,12 @@ static ssize_t i8k_hwmon_pwm_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + struct dell_smm_data *data = dev_get_drvdata(dev); int err; bool enable; unsigned long val; - if (!auto_fan) + if (!data->auto_fan) return -ENODEV; err = kstrtoul(buf, 10, &val); @@ -763,9 +772,9 @@ static ssize_t i8k_hwmon_pwm_enable_store(struct device *dev, else return -EINVAL; - mutex_lock(&i8k_mutex); - err = i8k_enable_fan_auto_mode(enable); - mutex_unlock(&i8k_mutex); + mutex_lock(&data->i8k_mutex); + err = i8k_enable_fan_auto_mode(data, enable); + mutex_unlock(&data->i8k_mutex); return err ? err : count; } @@ -838,53 +847,56 @@ static struct attribute *i8k_attrs[] = { static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr, int index) { - if (disallow_fan_support && index >= 20) + struct device *dev = kobj_to_dev(kobj); + struct dell_smm_data *data = dev_get_drvdata(dev); + + if (data->disallow_fan_support && index >= 20) return 0; - if (disallow_fan_type_call && + if (data->disallow_fan_type_call && (index == 21 || index == 25 || index == 28)) return 0; if (index >= 0 && index <= 1 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1)) return 0; if (index >= 2 && index <= 3 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2)) return 0; if (index >= 4 && index <= 5 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3)) return 0; if (index >= 6 && index <= 7 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4)) return 0; if (index >= 8 && index <= 9 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5)) return 0; if (index >= 10 && index <= 11 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6)) return 0; if (index >= 12 && index <= 13 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7)) return 0; if (index >= 14 && index <= 15 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8)) return 0; if (index >= 16 && index <= 17 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9)) return 0; if (index >= 18 && index <= 19 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10)) return 0; if (index >= 20 && index <= 23 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1)) return 0; if (index >= 24 && index <= 26 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2)) return 0; if (index >= 27 && index <= 29 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3)) return 0; - if (index == 23 && !auto_fan) + if (index == 23 && !data->auto_fan) return 0; return attr->mode; @@ -898,65 +910,65 @@ __ATTRIBUTE_GROUPS(i8k); static int __init dell_smm_init_hwmon(struct device *dev) { + struct dell_smm_data *data = dev_get_drvdata(dev); + struct device *i8k_hwmon_dev; int err; - i8k_hwmon_flags = 0; - /* CPU temperature attributes, if temperature type is OK */ err = i8k_get_temp_type(0); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1; /* check for additional temperature sensors */ err = i8k_get_temp_type(1); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2; err = i8k_get_temp_type(2); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3; err = i8k_get_temp_type(3); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4; err = i8k_get_temp_type(4); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5; err = i8k_get_temp_type(5); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6; err = i8k_get_temp_type(6); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7; err = i8k_get_temp_type(7); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8; err = i8k_get_temp_type(8); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9; err = i8k_get_temp_type(9); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10; /* First fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(0); + err = i8k_get_fan_status(data, 0); if (err < 0) - err = i8k_get_fan_type(0); + err = i8k_get_fan_type(data, 0); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1; /* Second fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(1); + err = i8k_get_fan_status(data, 1); if (err < 0) - err = i8k_get_fan_type(1); + err = i8k_get_fan_type(data, 1); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2; /* Third fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(2); + err = i8k_get_fan_status(data, 2); if (err < 0) - err = i8k_get_fan_type(2); + err = i8k_get_fan_type(data, 2); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; - i8k_hwmon_dev = devm_hwmon_device_register_with_groups(dev, "dell_smm", NULL, i8k_groups); + i8k_hwmon_dev = devm_hwmon_device_register_with_groups(dev, "dell_smm", data, i8k_groups); return PTR_ERR_OR_ZERO(i8k_hwmon_dev); } @@ -1217,73 +1229,38 @@ static struct dmi_system_id i8k_whitelist_fan_control[] __initdata = { static int __init dell_smm_probe(struct platform_device *pdev) { - int err; - - err = dell_smm_init_hwmon(&pdev->dev); - if (err) - return err; - - i8k_init_procfs(&pdev->dev); - - return 0; -} - -static struct platform_driver dell_smm_driver = { - .driver = { - .name = KBUILD_MODNAME, - }, -}; - -static struct platform_device *dell_smm_device; - -/* - * Probe for the presence of a supported laptop. - */ -static int __init i8k_init(void) -{ + struct dell_smm_data *data; 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; + data = devm_kzalloc(&pdev->dev, sizeof(struct dell_smm_data), GFP_KERNEL); + if (!data) + return -ENOMEM; - pr_info("not running on a supported Dell system.\n"); - pr_info("vendor=%s, model=%s, version=%s\n", - i8k_get_dmi_data(DMI_SYS_VENDOR), - i8k_get_dmi_data(DMI_PRODUCT_NAME), - i8k_get_dmi_data(DMI_BIOS_VERSION)); - } + mutex_init(&data->i8k_mutex); + data->i8k_fan_mult = I8K_FAN_MULT; + data->i8k_fan_max = I8K_FAN_HIGH; + data->types[0] = INT_MIN; + data->types[1] = INT_MIN; + data->types[2] = INT_MIN; + platform_set_drvdata(pdev, data); if (dmi_check_system(i8k_blacklist_fan_support_dmi_table)) { - pr_warn("broken Dell BIOS detected, disallow fan support\n"); + dev_warn(&pdev->dev, "broken Dell BIOS detected, disallow fan support\n"); if (!force) - disallow_fan_support = true; + data->disallow_fan_support = true; } if (dmi_check_system(i8k_blacklist_fan_type_dmi_table)) { - pr_warn("broken Dell BIOS detected, disallow fan type call\n"); + dev_warn(&pdev->dev, "broken Dell BIOS detected, disallow fan type call\n"); if (!force) - disallow_fan_type_call = true; + data->disallow_fan_type_call = true; } - strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), - sizeof(bios_version)); - strlcpy(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; - } + strscpy(data->bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), + sizeof(data->bios_version)); + strscpy(data->bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), + sizeof(data->bios_machineid)); /* * Set fan multiplier and maximal fan speed from dmi config @@ -1291,23 +1268,25 @@ static int __init i8k_init(void) */ id = dmi_first_match(i8k_dmi_table); if (id && id->driver_data) { - const struct i8k_config_data *conf = id->driver_data; + struct i8k_config_data *conf = id->driver_data; + if (!fan_mult && conf->fan_mult) fan_mult = conf->fan_mult; + if (!fan_max && conf->fan_max) fan_max = conf->fan_max; } - i8k_fan_max = fan_max ? : I8K_FAN_HIGH; /* Must not be 0 */ - i8k_pwm_mult = DIV_ROUND_UP(255, i8k_fan_max); + data->i8k_fan_max = fan_max ? : I8K_FAN_HIGH; /* Must not be 0 */ + data->i8k_pwm_mult = DIV_ROUND_UP(255, data->i8k_fan_max); fan_control = dmi_first_match(i8k_whitelist_fan_control); if (fan_control && fan_control->driver_data) { - const struct i8k_fan_control_data *data = fan_control->driver_data; + struct i8k_fan_control_data *control = fan_control->driver_data; - manual_fan = data->manual_fan; - auto_fan = data->auto_fan; - pr_info("enabling support for setting automatic/manual fan control\n"); + data->manual_fan = control->manual_fan; + data->auto_fan = control->auto_fan; + dev_info(&pdev->dev, "enabling support for setting automatic/manual fan control\n"); } if (!fan_mult) { @@ -1316,16 +1295,63 @@ static int __init i8k_init(void) * If fan reports rpm value too high then set multiplier to 1 */ for (fan = 0; fan < 2; ++fan) { - ret = i8k_get_fan_nominal_speed(fan, i8k_fan_max); + ret = i8k_get_fan_nominal_speed(data, fan, data->i8k_fan_max); if (ret < 0) continue; + if (ret > I8K_FAN_MAX_RPM) - i8k_fan_mult = 1; + data->i8k_fan_mult = 1; break; } } else { /* Fan multiplier was specified in module param or in dmi */ - i8k_fan_mult = fan_mult; + data->i8k_fan_mult = fan_mult; + } + + ret = dell_smm_init_hwmon(&pdev->dev); + if (ret) + return ret; + + i8k_init_procfs(&pdev->dev); + + return 0; +} + +static struct platform_driver dell_smm_driver = { + .driver = { + .name = KBUILD_MODNAME, + }, +}; + +static struct platform_device *dell_smm_device; + +/* + * Probe for the presence of a supported laptop. + */ +static int __init i8k_init(void) +{ + /* + * 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=%s, model=%s, version=%s\n", + i8k_get_dmi_data(DMI_SYS_VENDOR), + i8k_get_dmi_data(DMI_PRODUCT_NAME), + i8k_get_dmi_data(DMI_BIOS_VERSION)); + } + + /* + * 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; } dell_smm_device = platform_create_bundle(&dell_smm_driver, dell_smm_probe, NULL, 0, NULL,