From: Jamie Lentin <jm@lentin.co.uk>
Date: Thu, 1 Nov 2012 23:55:43 +0000 (+0000)
Subject: hwmon: Only include of_match_table with CONFIG_OF_GPIO
X-Git-Tag: firefly_0821_release~3680^2~1683^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eaa7cc60f7dff5e74ef387ace8228235fab8241b;p=firefly-linux-kernel-4.4.55.git

hwmon: Only include of_match_table with CONFIG_OF_GPIO

The following fixes build errors on sparc. Without any DT support,
of_match_ptr is NULL and the below is a no-op. However, if just
CONFIG_OF is defined then so is of_match_ptr.

All useful parts of the gpio-fan DT support rely on CONFIG_OF_GPIO
anyway, so of_match_table should too.

Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---

diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index 36509ae32083..1381a2e3bbd4 100644
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -630,7 +630,9 @@ static struct platform_driver gpio_fan_driver = {
 	.driver	= {
 		.name	= "gpio-fan",
 		.pm	= GPIO_FAN_PM,
+#ifdef CONFIG_OF_GPIO
 		.of_match_table = of_match_ptr(of_gpio_fan_match),
+#endif
 	},
 };