Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef7a6124 authored by Linus Walleij's avatar Linus Walleij Committed by Guenter Roeck
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent f9013c16

drivers/hwmon/gpio-fan.c

+22 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/gpio-fan.h

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * 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 */