Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-rpi.git] / drivers / pinctrl / pinctrl-digicolor.c

diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
index 38a7799..f1343d6 100644 (file)
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
@@ -171,7 +171,7 @@ static struct pinmux_ops dc_pmxops = {
 
 static int dc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
 
 static int dc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {

-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);

        int reg_off = GP_DRIVE0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 drive;
        int reg_off = GP_DRIVE0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 drive;


@@ -191,7 +191,7 @@ static void dc_gpio_set(struct gpio_chip *chip, unsigned gpio, int value);
 static int dc_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
                                    int value)
 {
 static int dc_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
                                    int value)
 {

-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);

        int reg_off = GP_DRIVE0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 drive;
        int reg_off = GP_DRIVE0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 drive;


@@ -210,7 +210,7 @@ static int dc_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
 
 static int dc_gpio_get(struct gpio_chip *chip, unsigned gpio)
 {
 
 static int dc_gpio_get(struct gpio_chip *chip, unsigned gpio)
 {

-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);

        int reg_off = GP_INPUT(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 input;
        int reg_off = GP_INPUT(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 input;


@@ -222,7 +222,7 @@ static int dc_gpio_get(struct gpio_chip *chip, unsigned gpio)
 
 static void dc_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
 {
 
 static void dc_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
 {

-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);

        int reg_off = GP_OUTPUT0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 output;
        int reg_off = GP_OUTPUT0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 output;


@@ -244,7 +244,7 @@ static int dc_gpiochip_add(struct dc_pinmap *pmap, struct device_node *np)
        int ret;
 
        chip->label             = DRIVER_NAME;
        int ret;
 
        chip->label             = DRIVER_NAME;

-       chip->dev               = pmap->dev;
+       chip->parent            = pmap->dev;

        chip->request           = gpiochip_generic_request;
        chip->free              = gpiochip_generic_free;
        chip->direction_input   = dc_gpio_direction_input;
        chip->request           = gpiochip_generic_request;
        chip->free              = gpiochip_generic_free;
        chip->direction_input   = dc_gpio_direction_input;


@@ -258,7 +258,7 @@ static int dc_gpiochip_add(struct dc_pinmap *pmap, struct device_node *np)
 
        spin_lock_init(&pmap->lock);
 
 
        spin_lock_init(&pmap->lock);
 

-       ret = gpiochip_add(chip);
+       ret = gpiochip_add_data(chip, pmap);

        if (ret < 0)
                return ret;
 
        if (ret < 0)
                return ret;