From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966729AbdAKNhM (ORCPT ); Wed, 11 Jan 2017 08:37:12 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:60453 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966666AbdAKNhK (ORCPT ); Wed, 11 Jan 2017 08:37:10 -0500 From: Arnd Bergmann To: Tejun Heo Cc: Arnd Bergmann , Bartlomiej Zolnierkiewicz , Fabien Lahoudere , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ahci: imx: fix building without hwmon or thermal Date: Wed, 11 Jan 2017 14:36:16 +0100 Message-Id: <20170111133652.3715437-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:QEKAGAIxuoB1AVlSWx90zIATSv/FyZcsCnDrooDGnHXoXQ+yP7h j1zRV8dOScKZ+cs/18r9k9YEbVX71m0v1p2lVJgxL0K61cxcDEo7eP6kxnqiZi1R9VY87sk p6CtnzLMckD5FuY9BWnrXxSfRncl8+gKZinxwoMQDtoV0S9HarI8MtgTCSVFfoQO+wm39yS VPl+cjwZHkoWzMcwwG3fg== X-UI-Out-Filterresults: notjunk:1;V01:K0:VAM9VMpnG+0=:jxD8UZKBsFN99tiqYRQVht ggQXQOCLyYDeSWUoEAL77Yme2z2W60PRmnsb5+IEO/xQAcQRrr564hfxQVXuW3Bpl/r8sEHxD Is/IoMtueQCEbO7uiKVBIAnn9j2C6eul/qgUPuwZH+6qFjIc/M7tjVcPX0iIWeElwSraaJSSb ajlJE+10nbMKMnw/c8/dCv3Ij+h3Q7678nY+XD5H5r9Zlp4T3qhMAG0dWZViGwEqIRkf5L+09 cm5ie6zBFHdLp47N+UaNPNQDO5pLQugGpOaPxGdxOdh3X1vQCuSJa71b4RL1V3gChX6wVooDn aB9JoJHykpQ1Mf5qJgPLgxNXa9FtGYs/Zfgoh3Yyc4uQS6VBcqqbPCUMbeOVNjbqV1F1eRGbV PIrNod+rDIifUJHHw+fl0zjoKVYcIi1WIwJJK/3UlG4b+PTTuda3dgv0Vpjj/W9ueoYsGiBex D4BzNkPtdDPGyOkLWpqGNfDd6n0N2Pru0FdopknjjA4jXYB0/8lHBYhra9BvF+RBHvcB2AoG0 rWKUGxZc/iezdvjhRbDMt7zWECW1zCQUU5h0tzINnYlNJUBaSYVW/qBk5gWwM1X/6J7jFgE5W HUlL+jY1Zn95/qayZQcCpjMcYhYpQOG3GYeVjgMZL6hzMOsBP1PxzF2XI4eaR6nxQAOsXjg1k DBnClhdzy/CEfRT53jyShqZg/JFCBnqJkMnD1DiVKvd5k9eolVgsa6bC/VaxrCfzol8A= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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; -- 2.9.0