hwmon: (gpio-fan) Localize platform data

There is not a single user of the platform data header in
<linux/gpio-fan.h>. We can conclude that all current users are
probing from the device tree, so start simplifying the code by
pulling the header into the driver.

Convert "unsigned" to "unsigned int" in the process to make
checkpatch happy.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c
index f29cee9398effdfaf0008b441c3b07b492dfacd5..cfa8d9b578dd07c74690b23e08fa4ca5e7e52fb8 100644 (file)
--- a/drivers/hwmon/gpio-fan.c
+++ b/drivers/hwmon/gpio-fan.c
@@ -30,12 +30,33 @@
 #include <linux/mutex.h>
 #include <linux/hwmon.h>
 #include <linux/gpio.h>
-#include <linux/gpio-fan.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/thermal.h>
 
+struct gpio_fan_alarm {
+       unsigned int    gpio;
+       unsigned int    active_low;
+};
+
+struct gpio_fan_speed {
+       int rpm;
+       int ctrl_val;
+};
+
+struct gpio_fan_platform_data {
+       int                     num_ctrl;
+       unsigned int            *ctrl;  /* fan control GPIOs. */
+       struct gpio_fan_alarm   *alarm; /* fan alarm GPIO. */
+       /*
+        * Speed conversion array: rpm from/to GPIO bit field.
+        * This array _must_ be sorted in ascending rpm order.
+        */
+       int                     num_speed;
+       struct gpio_fan_speed   *speed;
+};
+
 struct gpio_fan_data {
        struct platform_device  *pdev;
        struct device           *hwmon_dev;

diff --git a/include/linux/gpio-fan.h b/include/linux/gpio-fan.h
deleted file mode 100644 (file)
index 0966591..0000000
--- a/include/linux/gpio-fan.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * include/linux/gpio-fan.h
- *
- * Platform data structure for GPIO fan driver
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __LINUX_GPIO_FAN_H
-#define __LINUX_GPIO_FAN_H
-
-struct gpio_fan_alarm {
-       unsigned        gpio;
-       unsigned        active_low;
-};
-
-struct gpio_fan_speed {
-       int rpm;
-       int ctrl_val;
-};
-
-struct gpio_fan_platform_data {
-       int                     num_ctrl;
-       unsigned                *ctrl;  /* fan control GPIOs. */
-       struct gpio_fan_alarm   *alarm; /* fan alarm GPIO. */
-       /*
-        * Speed conversion array: rpm from/to GPIO bit field.
-        * This array _must_ be sorted in ascending rpm order.
-        */
-       int                     num_speed;
-       struct gpio_fan_speed   *speed;
-};
-
-#endif /* __LINUX_GPIO_FAN_H */