[PATCH v4 2/4] staging: greybus: gpio: Use gpiochip_get_data() in place of gpio_chip_to_gb_gpio_controller()

[Nishad Kamdar]

This patch drops gpio_chip_to_gb_gpio_controller(),
and uses gpiochip_get_data() to retrieve the container
of struct gpio_chip.

Signed-off-by: Nishad Kamdar <nishadkam...@gmail.com>
---
Changes in v4:
 - Introduce this change as a new patch.
---
 drivers/staging/greybus/gpio.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 1af291aa1b6e..2dd04682cbc6 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -40,8 +40,6 @@ struct gb_gpio_controller {
        struct gpio_chip        chip;
        struct mutex            irq_lock;
 };
-#define gpio_chip_to_gb_gpio_controller(chip) \
-       container_of(chip, struct gb_gpio_controller, chip)
 #define irq_data_to_gpio_chip(d) (d->domain->host_data)
 
 static int gb_gpio_line_count_operation(struct gb_gpio_controller *ggc)
@@ -270,7 +268,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;
@@ -280,7 +278,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;
@@ -290,7 +288,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;
@@ -328,7 +326,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);
 }
@@ -336,7 +334,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) {
@@ -405,21 +403,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;
 
@@ -433,7 +431,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);
 }
@@ -441,14 +439,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;
 
@@ -462,7 +460,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);
 }
@@ -470,7 +468,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)
-- 
2.17.1