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

pinctrl: abx500: 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().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-08 08:29:43 +01:00
parent 68ab012600
commit 2b016d2793
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/pinctrl/nomadik/pinctrl-abx500.c
View File

@ -109,19 +109,10 @@ struct abx500_pinctrl {
int irq_cluster_size; int irq_cluster_size;
}; };
/**
* to_abx500_pinctrl() - get the pointer to abx500_pinctrl
* @chip: Member of the structure abx500_pinctrl
*/
static inline struct abx500_pinctrl *to_abx500_pinctrl(struct gpio_chip *chip)
{
return container_of(chip, struct abx500_pinctrl, chip);
}
static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg, static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg,
unsigned offset, bool *bit) unsigned offset, bool *bit)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
u8 pos = offset % 8; u8 pos = offset % 8;
u8 val; u8 val;
int ret; int ret;
@ -143,7 +134,7 @@ static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg,
static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg, static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg,
unsigned offset, int val) unsigned offset, int val)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
u8 pos = offset % 8; u8 pos = offset % 8;
int ret; int ret;
@ -164,7 +155,7 @@ static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg,
*/ */
static int abx500_gpio_get(struct gpio_chip *chip, unsigned offset) static int abx500_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
bool bit; bool bit;
bool is_out; bool is_out;
u8 gpio_offset = offset - 1; u8 gpio_offset = offset - 1;
@ -192,7 +183,7 @@ out:
static void abx500_gpio_set(struct gpio_chip *chip, unsigned offset, int val) static void abx500_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
int ret; int ret;
ret = abx500_gpio_set_bits(chip, AB8500_GPIO_OUT1_REG, offset, val); ret = abx500_gpio_set_bits(chip, AB8500_GPIO_OUT1_REG, offset, val);
@ -272,7 +263,7 @@ out:
static bool abx500_pullud_supported(struct gpio_chip *chip, unsigned gpio) static bool abx500_pullud_supported(struct gpio_chip *chip, unsigned gpio)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
struct pullud *pullud = pct->soc->pullud; struct pullud *pullud = pct->soc->pullud;
return (pullud && return (pullud &&
@ -284,7 +275,7 @@ static int abx500_gpio_direction_output(struct gpio_chip *chip,
unsigned offset, unsigned offset,
int val) int val)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
unsigned gpio; unsigned gpio;
int ret; int ret;
@ -332,7 +323,7 @@ static int abx500_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
static int abx500_gpio_to_irq(struct gpio_chip *chip, unsigned offset) static int abx500_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{ {
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
/* The AB8500 GPIO numbers are off by one */ /* The AB8500 GPIO numbers are off by one */
int gpio = offset + 1; int gpio = offset + 1;
int hwirq; int hwirq;
@ -634,7 +625,7 @@ static void abx500_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
{ {
unsigned i; unsigned i;
unsigned gpio = chip->base; unsigned gpio = chip->base;
struct abx500_pinctrl *pct = to_abx500_pinctrl(chip); struct abx500_pinctrl *pct = gpiochip_get_data(chip);
struct pinctrl_dev *pctldev = pct->pctldev; struct pinctrl_dev *pctldev = pct->pctldev;
for (i = 0; i < chip->ngpio; i++, gpio++) { for (i = 0; i < chip->ngpio; i++, gpio++) {
@ -1211,7 +1202,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
pct->irq_cluster = pct->soc->gpio_irq_cluster; pct->irq_cluster = pct->soc->gpio_irq_cluster;
pct->irq_cluster_size = pct->soc->ngpio_irq_cluster; pct->irq_cluster_size = pct->soc->ngpio_irq_cluster;
ret = gpiochip_add(&pct->chip); ret = gpiochip_add_data(&pct->chip, pct);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret); dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
return ret; return ret;