iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: cygnus-gpio: use gpiochip data pointer

Browse Source 
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: bcm-kernel-feedback-list@broadcom.com
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Jon Mason <jonmason@broadcom.com>
Acked-by: Ray Jui <rjui@broadcom.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 23:48:26 +01:00
parent 521a2ad6f8
commit 69fd6aea3e
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
View File

@ -26,7 +26,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h> #include <linux/gpio/driver.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
@ -98,11 +98,6 @@ struct iproc_gpio {
struct pinctrl_desc pctldesc; struct pinctrl_desc pctldesc;
}; };
static inline struct iproc_gpio *to_iproc_gpio(struct gpio_chip *gc)
{
return container_of(gc, struct iproc_gpio, gc);
}
/* /*
* Mapping from PINCONF pins to GPIO pins is 1-to-1 * Mapping from PINCONF pins to GPIO pins is 1-to-1
*/ */
@ -147,7 +142,7 @@ static inline bool iproc_get_bit(struct iproc_gpio *chip, unsigned int reg,
static void iproc_gpio_irq_handler(struct irq_desc *desc) static void iproc_gpio_irq_handler(struct irq_desc *desc)
{ {
struct gpio_chip *gc = irq_desc_get_handler_data(desc); struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
struct irq_chip *irq_chip = irq_desc_get_chip(desc); struct irq_chip *irq_chip = irq_desc_get_chip(desc);
int i, bit; int i, bit;
@ -180,7 +175,7 @@ static void iproc_gpio_irq_handler(struct irq_desc *desc)
static void iproc_gpio_irq_ack(struct irq_data *d) static void iproc_gpio_irq_ack(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned gpio = d->hwirq; unsigned gpio = d->hwirq;
unsigned int offset = IPROC_GPIO_REG(gpio, unsigned int offset = IPROC_GPIO_REG(gpio,
IPROC_GPIO_INT_CLR_OFFSET); IPROC_GPIO_INT_CLR_OFFSET);
@ -199,7 +194,7 @@ static void iproc_gpio_irq_ack(struct irq_data *d)
static void iproc_gpio_irq_set_mask(struct irq_data *d, bool unmask) static void iproc_gpio_irq_set_mask(struct irq_data *d, bool unmask)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned gpio = d->hwirq; unsigned gpio = d->hwirq;
iproc_set_bit(chip, IPROC_GPIO_INT_MSK_OFFSET, gpio, unmask); iproc_set_bit(chip, IPROC_GPIO_INT_MSK_OFFSET, gpio, unmask);
@ -208,7 +203,7 @@ static void iproc_gpio_irq_set_mask(struct irq_data *d, bool unmask)
static void iproc_gpio_irq_mask(struct irq_data *d) static void iproc_gpio_irq_mask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
@ -219,7 +214,7 @@ static void iproc_gpio_irq_mask(struct irq_data *d)
static void iproc_gpio_irq_unmask(struct irq_data *d) static void iproc_gpio_irq_unmask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
@ -230,7 +225,7 @@ static void iproc_gpio_irq_unmask(struct irq_data *d)
static int iproc_gpio_irq_set_type(struct irq_data *d, unsigned int type) static int iproc_gpio_irq_set_type(struct irq_data *d, unsigned int type)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned gpio = d->hwirq; unsigned gpio = d->hwirq;
bool level_triggered = false; bool level_triggered = false;
bool dual_edge = false; bool dual_edge = false;
@ -292,7 +287,7 @@ static struct irq_chip iproc_gpio_irq_chip = {
*/ */
static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset) static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset)
{ {
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned gpio = gc->base + offset; unsigned gpio = gc->base + offset;
/* not all Iproc GPIO pins can be muxed individually */ /* not all Iproc GPIO pins can be muxed individually */
@ -304,7 +299,7 @@ static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset)
static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset) static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset)
{ {
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned gpio = gc->base + offset; unsigned gpio = gc->base + offset;
if (!chip->pinmux_is_supported) if (!chip->pinmux_is_supported)
@ -315,7 +310,7 @@ static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset)
static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio) static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
{ {
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
@ -330,7 +325,7 @@ static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
static int iproc_gpio_direction_output(struct gpio_chip *gc, unsigned gpio, static int iproc_gpio_direction_output(struct gpio_chip *gc, unsigned gpio,
int val) int val)
{ {
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
@ -345,7 +340,7 @@ static int iproc_gpio_direction_output(struct gpio_chip *gc, unsigned gpio,
static void iproc_gpio_set(struct gpio_chip *gc, unsigned gpio, int val) static void iproc_gpio_set(struct gpio_chip *gc, unsigned gpio, int val)
{ {
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->lock, flags); spin_lock_irqsave(&chip->lock, flags);
@ -357,7 +352,7 @@ static void iproc_gpio_set(struct gpio_chip *gc, unsigned gpio, int val)
static int iproc_gpio_get(struct gpio_chip *gc, unsigned gpio) static int iproc_gpio_get(struct gpio_chip *gc, unsigned gpio)
{ {
struct iproc_gpio *chip = to_iproc_gpio(gc); struct iproc_gpio *chip = gpiochip_get_data(gc);
unsigned int offset = IPROC_GPIO_REG(gpio, unsigned int offset = IPROC_GPIO_REG(gpio,
IPROC_GPIO_DATA_IN_OFFSET); IPROC_GPIO_DATA_IN_OFFSET);
unsigned int shift = IPROC_GPIO_SHIFT(gpio); unsigned int shift = IPROC_GPIO_SHIFT(gpio);
@ -706,7 +701,7 @@ static int iproc_gpio_probe(struct platform_device *pdev)
chip->pinmux_is_supported = of_property_read_bool(dev->of_node, chip->pinmux_is_supported = of_property_read_bool(dev->of_node,
"gpio-ranges"); "gpio-ranges");
ret = gpiochip_add(gc); ret = gpiochip_add_data(gc, chip);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "unable to add GPIO chip\n"); dev_err(dev, "unable to add GPIO chip\n");
return ret; return ret;