mfd: lm3533: Move to new GPIO descriptor-based APIs
PATCH v2 1/1 mfd: lm3533: Move to new GPIO descriptor-based APIs
Legacy GPIO APIs are subject to remove. Convert the driver to new APIs.
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: left platform data in place (Johan), and rebased this patch
drivers/mfd/lm3533-core.c | 24 +++++++----------------- include/linux/mfd/lm3533.h | 5 ++--- 2 files changed, 9 insertions(+), 20 deletions(-)
drivers/mfd/lm3533-core.c +7 -17
@@ -11,7 +11,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/err.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/mfd/core.h> #include <linux/regmap.h>
@@ -225,14 +225,12 @@ static int lm3533_set_lvled_config(struct lm3533 *lm3533, u8 lvled, u8 led)static void lm3533_enable (struct lm3533 *lm3533) { -if (gpio_is_valid (lm3533->gpio_hwen)) -gpio_set_value (lm3533->gpio_hwen,1 ); +gpiod_set_value (lm3533->hwen,1 ); }static void lm3533_disable (struct lm3533 *lm3533) { -if (gpio_is_valid (lm3533->gpio_hwen)) -gpio_set_value (lm3533->gpio_hwen,0 ); +gpiod_set_value (lm3533->hwen,0 ); }enum lm3533_attribute_type {
@@ -483,18 +481,10 @@ static int lm3533_device_init(struct lm3533 *lm3533)return -EINVAL ; } - lm3533->gpio_hwen = pdata->gpio_hwen; - -if (gpio_is_valid (lm3533->gpio_hwen)) { - ret =devm_gpio_request_one (lm3533->dev, lm3533->gpio_hwen, -GPIOF_OUT_INIT_LOW ,"lm3533-hwen" ); -if (ret <0 ) { -dev_err (lm3533->dev, -"failed to request HWEN GPIO %d\n" , - lm3533->gpio_hwen); -return ret; - } - } + lm3533->hwen =devm_gpiod_get (lm3533->dev,NULL ,GPIOD_OUT_LOW ); +if (IS_ERR (lm3533->hwen)) +return dev_err_probe (lm3533->dev,PTR_ERR (lm3533->hwen),"failed to request HWEN GPIO\n" ); +gpiod_set_consumer_name (lm3533->hwen,"lm3533-hwen" );lm3533_enable (lm3533);
include/linux/mfd/lm3533.h +2 -3
@@ -16,6 +16,7 @@ DEVICE_ATTR(_name, S_IRUGO | S_IWUSR , show_##_name, store_##_name)struct device ; +struct gpio_desc ;struct regmap ;struct lm3533 {
@@ -23,7 +24,7 @@ struct lm3533 {struct regmap *regmap; -int gpio_hwen; +struct gpio_desc *hwen;int irq; unsigned have_als:1;
@@ -69,8 +70,6 @@ enum lm3533_boost_ovp { };struct lm3533_platform_data { -int gpio_hwen; -enum lm3533_boost_ovp boost_ovp;enum lm3533_boost_freq boost_freq;
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Lee Jones
maintainerQuoted 8 lines · Andy Shevchenko
Legacy GPIO APIs are subject to remove. Convert the driver to new APIs.
Signed-off-by Andy Shevchenko <[email protected]>---
v2: left platform data in place (Johan), and rebased this patchdrivers/mfd/lm3533-core.c | 24 +++++++----------------- include/linux/mfd/lm3533.h | 5 ++--- 2 files changed, 9 insertions(+), 20 deletions(-)
It would be nice to get Johan's RB on this.
Quoted 86 lines
drivers/mfd/lm3533-core.c +7
-17@@ -11,7 +11,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/err.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/mfd/core.h> #include <linux/regmap.h> @@ -225,14 +225,12 @@ static int lm3533_set_lvled_config(struct lm3533 *lm3533, u8 lvled, u8 led)static void lm3533_enable (struct lm3533 *lm3533) { -if (gpio_is_valid (lm3533->gpio_hwen)) -gpio_set_value (lm3533->gpio_hwen,1 ); +gpiod_set_value (lm3533->hwen,1 ); }static void lm3533_disable (struct lm3533 *lm3533) { -if (gpio_is_valid (lm3533->gpio_hwen)) -gpio_set_value (lm3533->gpio_hwen,0 ); +gpiod_set_value (lm3533->hwen,0 ); }enum lm3533_attribute_type {@@ -483,18 +481,10 @@ static int lm3533_device_init(struct lm3533 *lm3533)return -EINVAL ; } - lm3533->gpio_hwen = pdata->gpio_hwen; - -if (gpio_is_valid (lm3533->gpio_hwen)) { - ret =devm_gpio_request_one (lm3533->dev, lm3533->gpio_hwen, -GPIOF_OUT_INIT_LOW ,"lm3533-hwen" ); -if (ret <0 ) { -dev_err (lm3533->dev, -"failed to request HWEN GPIO %d\n" , - lm3533->gpio_hwen); -return ret; - } - } + lm3533->hwen =devm_gpiod_get (lm3533->dev,NULL ,GPIOD_OUT_LOW ); +if (IS_ERR (lm3533->hwen)) +return dev_err_probe (lm3533->dev,PTR_ERR (lm3533->hwen),"failed to request HWEN GPIO\n" ); +gpiod_set_consumer_name (lm3533->hwen,"lm3533-hwen" );lm3533_enable (lm3533);include/linux/mfd/lm3533.h +2
-3@@ -16,6 +16,7 @@ DEVICE_ATTR(_name, S_IRUGO | S_IWUSR , show_##_name, store_##_name)struct device ; +struct gpio_desc ;struct regmap ;struct lm3533 {@@ -23,7 +24,7 @@ struct lm3533 {struct regmap *regmap; -int gpio_hwen; +struct gpio_desc *hwen;int irq; unsigned have_als:1;@@ -69,8 +70,6 @@ enum lm3533_boost_ovp { };struct lm3533_platform_data { -int gpio_hwen; -enum lm3533_boost_ovp boost_ovp;enum lm3533_boost_freq boost_freq;Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Signature · 1 line
Lee Jones [李琼斯]
Re: (subset) [PATCH v2 1/1] mfd: lm3533: Move to new GPIO descriptor-based APIs
In reply to Andy ShevchenkoQuoted 3 lines · Andy Shevchenko
Legacy GPIO APIs are subject to remove. Convert the driver to new APIs.
Applied, thanks!
[1/1] mfd: lm3533: Move to new GPIO descriptor-based APIs
commit: 8dc7c29f608649f3d9eca826e9d4fe4b8a32c472
--
Lee Jones [李琼斯]