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

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

powerpc: qe_lib-gpio: 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: Anatolij Gustschin <agust@denx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0d36fe65

drivers/soc/fsl/qe/gpio.c

+8 −12
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/gpio/driver.h>

/* FIXME: needed for gpio_to_chip() get rid of this */

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/export.h>

#include <linux/export.h>
@@ -37,15 +39,9 @@ struct qe_gpio_chip { 
	struct qe_pio_regs saved_regs;

	struct qe_pio_regs saved_regs;

};

};





static inline struct qe_gpio_chip *

to_qe_gpio_chip(struct of_mm_gpio_chip *mm_gc)

{

	return container_of(mm_gc, struct qe_gpio_chip, mm_gc);

}



static void qe_gpio_save_regs(struct of_mm_gpio_chip *mm_gc)

static void qe_gpio_save_regs(struct of_mm_gpio_chip *mm_gc)

{

{

	struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);

	struct qe_gpio_chip *qe_gc = gpiochip_get_data(&mm_gc->gc);

	struct qe_pio_regs __iomem *regs = mm_gc->regs;

	struct qe_pio_regs __iomem *regs = mm_gc->regs;





	qe_gc->cpdata = in_be32(&regs->cpdata);

	qe_gc->cpdata = in_be32(&regs->cpdata);
@@ -69,7 +65,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio) 
static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)

static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)

{

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);

	struct qe_gpio_chip *qe_gc = gpiochip_get_data(gc);

	struct qe_pio_regs __iomem *regs = mm_gc->regs;

	struct qe_pio_regs __iomem *regs = mm_gc->regs;

	unsigned long flags;

	unsigned long flags;

	u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);

	u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);
@@ -89,7 +85,7 @@ static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) 
static int qe_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)

static int qe_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)

{

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);

	struct qe_gpio_chip *qe_gc = gpiochip_get_data(gc);

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&qe_gc->lock, flags);

	spin_lock_irqsave(&qe_gc->lock, flags);
@@ -104,7 +100,7 @@ static int qe_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) 
static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)

static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)

{

{

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);

	struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);

	struct qe_gpio_chip *qe_gc = gpiochip_get_data(gc);

	unsigned long flags;

	unsigned long flags;





	qe_gpio_set(gc, gpio, val);

	qe_gpio_set(gc, gpio, val);
@@ -165,7 +161,7 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index) 
	}

	}





	mm_gc = to_of_mm_gpio_chip(gc);

	mm_gc = to_of_mm_gpio_chip(gc);

	qe_gc = to_qe_gpio_chip(mm_gc);

	qe_gc = gpiochip_get_data(gc);





	spin_lock_irqsave(&qe_gc->lock, flags);

	spin_lock_irqsave(&qe_gc->lock, flags);
@@ -302,7 +298,7 @@ static int __init qe_add_gpiochips(void) 
		gc->get = qe_gpio_get;

		gc->get = qe_gpio_get;

		gc->set = qe_gpio_set;

		gc->set = qe_gpio_set;





		ret = of_mm_gpiochip_add(np, mm_gc);

		ret = of_mm_gpiochip_add_data(np, mm_gc, qe_gc);

		if (ret)

		if (ret)

			goto err;

			goto err;

		continue;

		continue;