Commit 192d3507 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: sirf: 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: Barry Song <baohua@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9420023a

drivers/pinctrl/sirf/pinctrl-sirf.c

+12 −17
Original line number Diff line number Diff line
@@ -399,11 +399,6 @@ static int __init sirfsoc_pinmux_init(void) 
}

arch_initcall(sirfsoc_pinmux_init);



static inline struct sirfsoc_gpio_chip *to_sirfsoc_gpio(struct gpio_chip *gc)

{

	return container_of(gc, struct sirfsoc_gpio_chip, chip.gc);

}



static inline struct sirfsoc_gpio_bank *

sirfsoc_gpio_to_bank(struct sirfsoc_gpio_chip *sgpio, unsigned int offset)

{
@@ -418,7 +413,7 @@ static inline int sirfsoc_gpio_to_bankoff(unsigned int offset) 
static void sirfsoc_gpio_irq_ack(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);

	int idx = sirfsoc_gpio_to_bankoff(d->hwirq);

	u32 val, offset;
@@ -457,7 +452,7 @@ static void __sirfsoc_gpio_irq_mask(struct sirfsoc_gpio_chip *sgpio, 
static void sirfsoc_gpio_irq_mask(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);



	__sirfsoc_gpio_irq_mask(sgpio, bank, d->hwirq % SIRFSOC_GPIO_BANK_SIZE);
@@ -466,7 +461,7 @@ static void sirfsoc_gpio_irq_mask(struct irq_data *d) 
static void sirfsoc_gpio_irq_unmask(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);

	int idx = sirfsoc_gpio_to_bankoff(d->hwirq);

	u32 val, offset;
@@ -487,7 +482,7 @@ static void sirfsoc_gpio_irq_unmask(struct irq_data *d) 
static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, d->hwirq);

	int idx = sirfsoc_gpio_to_bankoff(d->hwirq);

	u32 val, offset;
@@ -549,7 +544,7 @@ static void sirfsoc_gpio_handle_irq(struct irq_desc *desc) 
{

	unsigned int irq = irq_desc_get_irq(desc);

	struct gpio_chip *gc = irq_desc_get_handler_data(desc);

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(gc);

	struct sirfsoc_gpio_bank *bank;

	u32 status, ctrl;

	int idx = 0;
@@ -607,7 +602,7 @@ static inline void sirfsoc_gpio_set_input(struct sirfsoc_gpio_chip *sgpio, 


static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset)

{

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);

	unsigned long flags;
@@ -630,7 +625,7 @@ static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset) 


static void sirfsoc_gpio_free(struct gpio_chip *chip, unsigned offset)

{

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);

	unsigned long flags;
@@ -646,7 +641,7 @@ static void sirfsoc_gpio_free(struct gpio_chip *chip, unsigned offset) 


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

{

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, gpio);

	int idx = sirfsoc_gpio_to_bankoff(gpio);

	unsigned long flags;
@@ -689,7 +684,7 @@ static inline void sirfsoc_gpio_set_output(struct sirfsoc_gpio_chip *sgpio, 
static int sirfsoc_gpio_direction_output(struct gpio_chip *chip,

	unsigned gpio, int value)

{

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, gpio);

	int idx = sirfsoc_gpio_to_bankoff(gpio);

	u32 offset;
@@ -708,7 +703,7 @@ static int sirfsoc_gpio_direction_output(struct gpio_chip *chip, 


static int sirfsoc_gpio_get_value(struct gpio_chip *chip, unsigned offset)

{

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);

	u32 val;

	unsigned long flags;
@@ -725,7 +720,7 @@ static int sirfsoc_gpio_get_value(struct gpio_chip *chip, unsigned offset) 
static void sirfsoc_gpio_set_value(struct gpio_chip *chip, unsigned offset,

	int value)

{

	struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(chip);

	struct sirfsoc_gpio_chip *sgpio = gpiochip_get_data(chip);

	struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(sgpio, offset);

	u32 ctrl;

	unsigned long flags;
@@ -814,7 +809,7 @@ static int sirfsoc_gpio_probe(struct device_node *np) 
	sgpio->chip.gc.parent = &pdev->dev;

	sgpio->chip.regs = regs;



	err = gpiochip_add(&sgpio->chip.gc);

	err = gpiochip_add_data(&sgpio->chip.gc, sgpio);

	if (err) {

		dev_err(&pdev->dev, "%s: error in probe function with status %d\n",

			np->full_name, err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE