misc: eeprom_93xx46: Simplify the usage of gpiod API
PATCH 1/1 misc: eeprom_93xx46: Simplify the usage of gpiod API
From: Fabio Estevam <[email protected]>
Commit 3ca9b1ac28398c ("misc: eeprom_93xx46: Add support for a GPIO 'select' line.") introduced the optional usage of 'select-gpios' by using the gpiod API in a convoluted way.
Rewrite the gpiod handling to make the code simpler.
Signed-off-by Fabio Estevam <[email protected]>
--- drivers/misc/eeprom/eeprom_93xx46.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/misc/eeprom/eeprom_93xx46.c +7 -17
@@ -377,8 +377,6 @@ static int eeprom_93xx46_probe_dt(struct spi_device *spi)struct device_node *np = spi->dev.of_node;struct eeprom_93xx46_platform_data *pd;u32 tmp; -int gpio; -enum of_gpio_flags of_flags;int ret; pd =devm_kzalloc (&spi->dev,sizeof (*pd),GFP_KERNEL );
@@ -403,22 +401,14 @@ static int eeprom_93xx46_probe_dt(struct spi_device *spi)if (of_property_read_bool (np,"read-only" )) pd->flags |=EE_READONLY ; - gpio =of_get_named_gpio_flags (np,"select-gpios" ,0 , &of_flags); -if (gpio_is_valid (gpio)) { -unsigned long flags = - of_flags ==OF_GPIO_ACTIVE_LOW ?GPIOF_ACTIVE_LOW :0 ; + pd->select =devm_gpiod_get_optional (&spi->dev,"select" , +GPIOD_OUT_LOW ); +if (IS_ERR (pd->select)) +return PTR_ERR (pd->select); - ret =devm_gpio_request_one (&spi->dev, gpio, flags, -"eeprom_93xx46_select" ); -if (ret) -return ret; - - pd->select =gpio_to_desc (gpio); - pd->prepare = select_assert; - pd->finish = select_deassert; - -gpiod_direction_output (pd->select,0 ); - } + pd->prepare = select_assert; + pd->finish = select_deassert; +gpiod_direction_output (pd->select,0 );if (of_id->data) {const struct eeprom_93xx46_devtype_data *data = of_id->data;
Signature · 1 line
2.7.4
PATCH 2/2 misc: eeprom_93xx46: Include <linux/gpio/consumer.h>
From: Fabio Estevam <[email protected]>
eeprom_93xx46_platform_data struct has a 'struct gpio_desc' type member, so it is better to include <linux/gpio/consumer.h>, which provides 'struct gpio_desc' type.
Signed-off-by Fabio Estevam <[email protected]>
--- include/linux/eeprom_93xx46.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/eeprom_93xx46.h +1 -2
@@ -2,8 +2,7 @@* Module: eeprom_93xx46 * platform description for 93xx46 EEPROMs. */ - -struct gpio_desc ; +#include <linux/gpio/consumer.h> struct eeprom_93xx46_platform_data {unsigned char flags;
Signature · 1 line
2.7.4