Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b2766fb authored by Linus Walleij's avatar Linus Walleij
Browse files

MIPS: ar7: use gpiochip data pointer 



This makes the driver use the data pointer added to the gpio_chip
to store a pointer to the state container instead of relying on
container_of().

Cc: linux-mips@linux-mips.org
Cc: Alban Bedel <albeu@free.fr>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 948e0ed8

arch/mips/ar7/gpio.c

+9 −17
Original line number Original line Diff line number Diff line
@@ -33,8 +33,7 @@ struct ar7_gpio_chip { 




static int ar7_gpio_get_value(struct gpio_chip *chip, unsigned gpio)

static int ar7_gpio_get_value(struct gpio_chip *chip, unsigned gpio)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_in = gpch->regs + AR7_GPIO_INPUT;

	void __iomem *gpio_in = gpch->regs + AR7_GPIO_INPUT;





	return !!(readl(gpio_in) & (1 << gpio));

	return !!(readl(gpio_in) & (1 << gpio));
@@ -42,8 +41,7 @@ static int ar7_gpio_get_value(struct gpio_chip *chip, unsigned gpio) 




static int titan_gpio_get_value(struct gpio_chip *chip, unsigned gpio)

static int titan_gpio_get_value(struct gpio_chip *chip, unsigned gpio)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_in0 = gpch->regs + TITAN_GPIO_INPUT_0;

	void __iomem *gpio_in0 = gpch->regs + TITAN_GPIO_INPUT_0;

	void __iomem *gpio_in1 = gpch->regs + TITAN_GPIO_INPUT_1;

	void __iomem *gpio_in1 = gpch->regs + TITAN_GPIO_INPUT_1;
@@ -53,8 +51,7 @@ static int titan_gpio_get_value(struct gpio_chip *chip, unsigned gpio) 
static void ar7_gpio_set_value(struct gpio_chip *chip,

static void ar7_gpio_set_value(struct gpio_chip *chip,

				unsigned gpio, int value)

				unsigned gpio, int value)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_out = gpch->regs + AR7_GPIO_OUTPUT;

	void __iomem *gpio_out = gpch->regs + AR7_GPIO_OUTPUT;

	unsigned tmp;

	unsigned tmp;
@@ -67,8 +64,7 @@ static void ar7_gpio_set_value(struct gpio_chip *chip, 
static void titan_gpio_set_value(struct gpio_chip *chip,

static void titan_gpio_set_value(struct gpio_chip *chip,

				unsigned gpio, int value)

				unsigned gpio, int value)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_out0 = gpch->regs + TITAN_GPIO_OUTPUT_0;

	void __iomem *gpio_out0 = gpch->regs + TITAN_GPIO_OUTPUT_0;

	void __iomem *gpio_out1 = gpch->regs + TITAN_GPIO_OUTPUT_1;

	void __iomem *gpio_out1 = gpch->regs + TITAN_GPIO_OUTPUT_1;

	unsigned tmp;

	unsigned tmp;
@@ -81,8 +77,7 @@ static void titan_gpio_set_value(struct gpio_chip *chip, 




static int ar7_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

static int ar7_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;

	void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;





	writel(readl(gpio_dir) | (1 << gpio), gpio_dir);

	writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
@@ -92,8 +87,7 @@ static int ar7_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) 




static int titan_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

static int titan_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_dir0 = gpch->regs + TITAN_GPIO_DIR_0;

	void __iomem *gpio_dir0 = gpch->regs + TITAN_GPIO_DIR_0;

	void __iomem *gpio_dir1 = gpch->regs + TITAN_GPIO_DIR_1;

	void __iomem *gpio_dir1 = gpch->regs + TITAN_GPIO_DIR_1;
@@ -108,8 +102,7 @@ static int titan_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) 
static int ar7_gpio_direction_output(struct gpio_chip *chip,

static int ar7_gpio_direction_output(struct gpio_chip *chip,

					unsigned gpio, int value)

					unsigned gpio, int value)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;

	void __iomem *gpio_dir = gpch->regs + AR7_GPIO_DIR;





	ar7_gpio_set_value(chip, gpio, value);

	ar7_gpio_set_value(chip, gpio, value);
@@ -121,8 +114,7 @@ static int ar7_gpio_direction_output(struct gpio_chip *chip, 
static int titan_gpio_direction_output(struct gpio_chip *chip,

static int titan_gpio_direction_output(struct gpio_chip *chip,

					unsigned gpio, int value)

					unsigned gpio, int value)

{

{

	struct ar7_gpio_chip *gpch =

	struct ar7_gpio_chip *gpch = gpiochip_get_data(chip);

				container_of(chip, struct ar7_gpio_chip, chip);

	void __iomem *gpio_dir0 = gpch->regs + TITAN_GPIO_DIR_0;

	void __iomem *gpio_dir0 = gpch->regs + TITAN_GPIO_DIR_0;

	void __iomem *gpio_dir1 = gpch->regs + TITAN_GPIO_DIR_1;

	void __iomem *gpio_dir1 = gpch->regs + TITAN_GPIO_DIR_1;
@@ -335,7 +327,7 @@ int __init ar7_gpio_init(void) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	ret = gpiochip_add(&gpch->chip);

	ret = gpiochip_add_data(&gpch->chip, gpch);

	if (ret) {

	if (ret) {

		printk(KERN_ERR "%s: failed to add gpiochip\n",

		printk(KERN_ERR "%s: failed to add gpiochip\n",

					gpch->chip.label);

					gpch->chip.label);