From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967231AbdAKORI (ORCPT ); Wed, 11 Jan 2017 09:17:08 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:50863 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966936AbdAKOQy (ORCPT ); Wed, 11 Jan 2017 09:16:54 -0500 X-AuditID: b6c32a3c-f79826d000002380-b0-58763e5315f5 From: Bartlomiej Zolnierkiewicz To: Arnd Bergmann Cc: Tejun Heo , Fabien Lahoudere , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ahci: imx: fix building without hwmon or thermal Date: Wed, 11 Jan 2017 15:16:44 +0100 Message-id: <3181052.yXLkhGQIbt@amdc3058> User-Agent: KMail/4.13.3 (Linux/3.13.0-96-generic; KDE/4.13.3; x86_64; ; ) In-reply-to: <20170111133652.3715437-1-arnd@arndb.de> MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset=us-ascii X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphleLIzCtJLcpLzFFi42LZdlhTXzfYrizC4OsPeYu/k46xW0xtu8hq cWzHIyaLy7vmsFn8Wn6U0YHV4/evSYwef59fZ/HYtKqTzePzJrkAligum5TUnMyy1CJ9uwSu jJsbbjEV7BSqWDq7n6WBsZu/i5GTQ0LAROLp1FPMELaYxIV769m6GLk4hAR2MErMOzGBBcJp Z5L48+8yUIYDrGPKKkOI+BxGidN3zrJDOF8ZJW7OnMUOMopNwEpiYvsqRhBbREBRYuqLZ2Ar mAX6GSWeH+UFsYUFXCUat1xiA7FZBFQlTi+eAmbzCmhKzL2xEaxXVMBLYsu+diYQm1PAVOLv xAZmiBpBiR+T77FAzJSX2Ld/KiuErSNx9tg6RpCDJAQms0tcen+bBeJqWYlNB6DedJGYP+0p G4QtLPHq+BZ2CFtaYtW/W0wQ9nRGie2/JSDmbGaUWLV7AlSRtcTh4xehlvFJvPvawwoxn1ei o00IosRDoqXlAAuE7Shx4c92VkgAdTBKHHj4h2kCo/wsJD/MQvLDLCQ/LGBkXsUollpQnJue WmxYYKFXnJhbXJqXrpecn7uJEZw2tGx2MF4653OIUYCDUYmHd8Lbkggh1sSy4srcQ4wSHMxK IryXrcoihHhTEiurUovy44tKc1KLDzFKc7AoifMua7SOEBJITyxJzU5NLUgtgskycXBKNTAK L/uYfl9TcqX/N65Sz5sVS7W7Vz40FWd7rLW8WS+3/Za5pahcws4F/e9y56aq5rh21pfNrt63 sd/GNLH6iWe+/fnwOBNu6R2OHF2zVmX3bz7+lUXiT8aq0EjOXiU3PV5eZZ5DSX52nPtdrPaH O3yONH2V+p1XZ0V4zEPmlM6lQhKRSlduKLEUZyQaajEXFScCAPIch+EXAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRmVeSWpSXmKPExsVy+t9jQd0gu7IIg6+rdC3+TjrGbjG17SKr xbEdj5gsLu+aw2bxa/lRRgdWj9+/JjF6/H1+ncVj06pONo/Pm+QCWKLcbDJSE1NSixRS85Lz UzLz0m2VQkPcdC2UFPISc1NtlSJ0fUOClBTKEnNKgTwjAzTg4BzgHqykb5fglnFzwy2mgp1C FUtn97M0MHbzdzFycEgImEhMWWXYxcgJZIpJXLi3nq2LkYtDSGAWo8TXlXNZIJyvjBIHz+9l A6liE7CSmNi+ihHEFhFQlJj64hkzSBGzQD+jxKWTD8GKhAVcJRq3XAKzWQRUJU4vngJm8wpo Ssy9sRGsWVTAS2LLvnYmEJtTwFTi78QGZohtXYwSHX0/oRoEJX5MvscCYjMLyEvs2z+VFcLW kli/8zjTBEagQxHKZiEpm4WkbAEj8ypGidSC5ILipPRcw7zUcr3ixNzi0rx0veT83E2M4Eh6 JrWD8eAu90OMAhyMSjy8D16URAixJpYVV+YeYpTgYFYS4b1sVRYhxJuSWFmVWpQfX1Sak1p8 iNEU6MOJzFKiyfnAKM8riTc0MTcxNzawMLe0NDFSEudtnP0sXEggPbEkNTs1tSC1CKaPiYNT qoHxSvsvEe5151tyyrI37pylcCrff9Hma///vf74cJ7L67VBK7z9D/Kfc38fWqe76MuCyZN5 TqttLSs5K/9WUUW4ZZ9ybqiHwlLLNf1Bj2WLMvbKcBX/antdellDKpCj0efaFe8+iePBHC+f hIZyBKjO+B19N4Ul9LznugcTS6+te6Xd/dxoUexuJZbijERDLeai4kQA+LmBfboCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170111141650epcas1p44d14729e4ce1e86b995abef34e0c56bd X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 X-Local-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRvsgrzshLHsoITsnpAbU2VuaW9yIFNvZnR3YXJlIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?QmFydGxvbWllaiBab2xuaWVya2lld2ljehtTUlBPTC1LZXJu?= =?UTF-8?B?ZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBF?= =?UTF-8?B?bmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 101P X-HopCount: 7 X-CMS-RootMailID: 20170111133703epcas4p39c0af66a9642a4904fbecbbac2367b7d X-RootMTR: 20170111133703epcas4p39c0af66a9642a4904fbecbbac2367b7d References: <20170111133652.3715437-1-arnd@arndb.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Wednesday, January 11, 2017 02:36:16 PM Arnd Bergmann wrote: > When CONFIG_HWMON is disabled, we now get a link failure: > > ERROR: "devm_hwmon_device_register_with_groups" [drivers/ata/ahci_imx.ko] undefined! > drivers/ata/ahci_imx.o: In function `imx_ahci_probe': > ahci_imx.c:(.text.imx_ahci_probe+0x304): undefined reference to `devm_thermal_zone_of_sensor_register' > > This makes the code calling into the hwmon subsystem compile-time > conditional, and adds a Kconfig dependency to avoid the corner > case of having HWMON=m and AHCI_IMX=y, by forcing AHCI_IMX=m in this > case. The thermal subsystem already has a check in its header, but > that also doesn't cover the THERMAL=m case, so we need a somewhat > complex Kconfig expression to handle all cases. > > Fixes: 54643a83b41a ("ahci: imx: Add imx53 SATA temperature sensor support") > Signed-off-by: Arnd Bergmann Looks fine to me (I see that this is the same solution as for TOUCHSCREEN_SUN4I from commit 4a6155a46565 but without hard dependency on HWMON). Thanks for fixing this. Reviewed-by: Bartlomiej Zolnierkiewicz Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/ata/Kconfig | 1 + > drivers/ata/ahci_imx.c | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig > index 78c002021029..70b57d2229d6 100644 > --- a/drivers/ata/Kconfig > +++ b/drivers/ata/Kconfig > @@ -129,6 +129,7 @@ config AHCI_ST > config AHCI_IMX > tristate "Freescale i.MX AHCI SATA support" > depends on MFD_SYSCON && (ARCH_MXC || COMPILE_TEST) > + depends on (HWMON && (THERMAL || !THERMAL_OF)) || !HWMON > help > This option enables support for the Freescale i.MX SoC's > onboard AHCI SATA. > diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c > index 420f065978dc..787567e840bd 100644 > --- a/drivers/ata/ahci_imx.c > +++ b/drivers/ata/ahci_imx.c > @@ -774,7 +774,8 @@ static int imx_ahci_probe(struct platform_device *pdev) > if (ret) > return ret; > > - if (imxpriv->type == AHCI_IMX53) { > + if (imxpriv->type == AHCI_IMX53 && > + IS_ENABLED(CONFIG_HWMON)) { > /* Add the temperature monitor */ > struct device *hwmon_dev;