pinctrl: bcm2835: use gpiochip data pointer (e19a5f79) · Commits · 戴 / test

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		#include <linux/delay.h>
		#include <linux/device.h>
		#include <linux/err.h>
		#include <linux/gpio.h>
		#include <linux/gpio/driver.h>
		#include <linux/interrupt.h>
		#include <linux/io.h>
		#include <linux/irq.h>
		@@ -337,14 +337,14 @@ static int bcm2835_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

		static int bcm2835_gpio_get(struct gpio_chip *chip, unsigned offset)
		{
		struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->parent);
		struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);

		return bcm2835_gpio_get_bit(pc, GPLEV0, offset);
		}

		static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
		{
		struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->parent);
		struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);

		bcm2835_gpio_set_bit(pc, value ? GPSET0 : GPCLR0, offset);
		}
		@@ -358,7 +358,7 @@ static int bcm2835_gpio_direction_output(struct gpio_chip *chip,

		static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
		{
		struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->parent);
		struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);

		return irq_linear_revmap(pc->irq_domain, offset);
		}
		@@ -1021,7 +1021,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
		}
		}

		err = gpiochip_add(&pc->gpio_chip);
		err = gpiochip_add_data(&pc->gpio_chip, pc);
		if (err) {
		dev_err(dev, "could not add GPIO chip\n");
		return err;