ahci: imx: fix building without hwmon or thermal
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Jan 2017 13:36:16 +0000 (14:36 +0100)
committerTejun Heo <tj@kernel.org>
Sun, 15 Jan 2017 23:51:12 +0000 (18:51 -0500)
commitd7969f5976a35b48ba4eb60aaad73535f1792019
tree371a1a4c521ef61d82ba106dcaea3f4f507d6330
parent7e11aabd48eb00240b280bf927cba9198664dcf6
ahci: imx: fix building without hwmon or thermal

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 <arnd@arndb.de>
Acked-by: Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/Kconfig
drivers/ata/ahci_imx.c