staging: greybus: gpio: use gpiochip_get_data
Subsystems (3)
PATCH 1/1 staging: greybus: gpio: use gpiochip_get_data
Instead of container_of, we can populate gpiochip_add_data 's last parameter and use gpiochip_get_data. It seems to be the standard.
Signed-off-by Rosen Penev <[email protected]>
--- drivers/staging/greybus/gpio.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)
drivers/staging/greybus/gpio.c +14 -19
@@ -42,11 +42,6 @@ struct gb_gpio_controller {struct mutex irq_lock; }; -static inline struct gb_gpio_controller *gpio_chip_to_gb_gpio_controller (struct gpio_chip *chip) -{ - return container_of(chip, struct gb_gpio_controller, chip); -} -static struct gpio_chip *irq_data_to_gpio_chip (struct irq_data *d) {return d->domain->host_data;
@@ -278,7 +273,7 @@ static void _gb_gpio_irq_set_type(struct gb_gpio_controller *ggc,static void gb_gpio_irq_mask (struct irq_data *d) {struct gpio_chip *chip =irq_data_to_gpio_chip (d); -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);struct gb_gpio_line *line = &ggc->lines[d->hwirq]; line->masked = true;
@@ -288,7 +283,7 @@ static void gb_gpio_irq_mask(struct irq_data *d)static void gb_gpio_irq_unmask (struct irq_data *d) {struct gpio_chip *chip =irq_data_to_gpio_chip (d); -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);struct gb_gpio_line *line = &ggc->lines[d->hwirq]; line->masked = false;
@@ -298,7 +293,7 @@ static void gb_gpio_irq_unmask(struct irq_data *d)static int gb_gpio_irq_set_type (struct irq_data *d,unsigned int type) {struct gpio_chip *chip =irq_data_to_gpio_chip (d); -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);struct gb_gpio_line *line = &ggc->lines[d->hwirq];struct device *dev = &ggc->gbphy_dev->dev;u8 irq_type;
@@ -336,7 +331,7 @@ static int gb_gpio_irq_set_type(struct irq_data *d, unsigned int type)static void gb_gpio_irq_bus_lock (struct irq_data *d) {struct gpio_chip *chip =irq_data_to_gpio_chip (d); -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);mutex_lock (&ggc->irq_lock); }
@@ -344,7 +339,7 @@ static void gb_gpio_irq_bus_lock(struct irq_data *d)static void gb_gpio_irq_bus_sync_unlock (struct irq_data *d) {struct gpio_chip *chip =irq_data_to_gpio_chip (d); -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);struct gb_gpio_line *line = &ggc->lines[d->hwirq];if (line->irq_type_pending) {
@@ -407,21 +402,21 @@ static int gb_gpio_request_handler(struct gb_operation *op)static int gb_gpio_request (struct gpio_chip *chip,unsigned int offset) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);return gb_gpio_activate_operation (ggc, (u8 )offset); }static void gb_gpio_free (struct gpio_chip *chip,unsigned int offset) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);gb_gpio_deactivate_operation (ggc, (u8 )offset); }static int gb_gpio_get_direction (struct gpio_chip *chip,unsigned int offset) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);u8 which;int ret;
@@ -435,7 +430,7 @@ static int gb_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)static int gb_gpio_direction_input (struct gpio_chip *chip,unsigned int offset) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);return gb_gpio_direction_in_operation (ggc, (u8 )offset); }
@@ -443,14 +438,14 @@ static int gb_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)static int gb_gpio_direction_output (struct gpio_chip *chip,unsigned int offset,int value) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);return gb_gpio_direction_out_operation (ggc, (u8 )offset, !!value); }static int gb_gpio_get (struct gpio_chip *chip,unsigned int offset) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);u8 which;int ret;
@@ -464,7 +459,7 @@ static int gb_gpio_get(struct gpio_chip *chip, unsigned int offset)static void gb_gpio_set (struct gpio_chip *chip,unsigned int offset,int value) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);gb_gpio_set_value_operation (ggc, (u8 )offset, !!value); }
@@ -472,7 +467,7 @@ static void gb_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)static int gb_gpio_set_config (struct gpio_chip *chip,unsigned int offset,unsigned long config) { -struct gb_gpio_controller *ggc =gpio_chip_to_gb_gpio_controller (chip); +struct gb_gpio_controller *ggc =gpiochip_get_data (chip);u32 debounce;if (pinconf_to_config_param (config) !=PIN_CONFIG_INPUT_DEBOUNCE )
@@ -579,7 +574,7 @@ static int gb_gpio_probe(struct gbphy_device *gbphy_dev,if (ret) goto exit_line_free; - ret =gpiochip_add_data (gpio,NULL ); + ret =gpiochip_add_data (gpio, ggc);if (ret) {dev_err (&gbphy_dev->dev,"failed to add gpio chip: %d\n" , ret); goto exit_line_free;
Signature · 1 line
2.47.0