* [PATCH] hwmon: Only include of_match_table with CONFIG_OF_GPIO
@ 2012-11-01 23:55 Jamie Lentin
2012-11-02 0:31 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Jamie Lentin @ 2012-11-01 23:55 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
drivers/hwmon/gpio-fan.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index 36509ae..1381a2e 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
},
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] hwmon: Only include of_match_table with CONFIG_OF_GPIO
2012-11-01 23:55 [PATCH] hwmon: Only include of_match_table with CONFIG_OF_GPIO Jamie Lentin
@ 2012-11-02 0:31 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2012-11-02 0:31 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 01, 2012 at 11:55:43PM +0000, Jamie Lentin wrote:
> 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>
> ---
> drivers/hwmon/gpio-fan.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
> index 36509ae..1381a2e 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
> },
Applied.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-02 0:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-01 23:55 [PATCH] hwmon: Only include of_match_table with CONFIG_OF_GPIO Jamie Lentin
2012-11-02 0:31 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).