diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2015-11-04 03:56:26 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-11-19 03:24:35 -0500 |
commit | 58383c78425e4ee1c077253cf297b641c861c02e (patch) | |
tree | 606949d2c6db8176c0659eaa935d022bf6d19974 /drivers/gpio/gpio-em.c | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) |
gpio: change member .dev to .parent
The name .dev in a struct is normally reserved for a struct device
that is let us say a superclass to the thing described by the struct.
struct gpio_chip stands out by confusingly using a struct device *dev
to point to the parent device (such as a platform_device) that
represents the hardware. As we want to give gpio_chip:s real devices,
this is not working. We need to rename this member to parent.
This was done by two coccinelle scripts, I guess it is possible to
combine them into one, but I don't know such stuff. They look like
this:
@@
struct gpio_chip *var;
@@
-var->dev
+var->parent
and:
@@
struct gpio_chip var;
@@
-var.dev
+var.parent
and:
@@
struct bgpio_chip *var;
@@
-var->gc.dev
+var->gc.parent
Plus a few instances of bgpio that I couldn't figure out how
to teach Coccinelle to rewrite.
This patch hits all over the place, but I *strongly* prefer this
solution to any piecemal approaches that just exercise patch
mechanics all over the place. It mainly hits drivers/gpio and
drivers/pinctrl which is my own backyard anyway.
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Alek Du <alek.du@intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-em.c')
-rw-r--r-- | drivers/gpio/gpio-em.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 6bca1e125e12..c3ca2b1c1dfe 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c | |||
@@ -103,7 +103,7 @@ static int em_gio_irq_reqres(struct irq_data *d) | |||
103 | struct em_gio_priv *p = irq_data_get_irq_chip_data(d); | 103 | struct em_gio_priv *p = irq_data_get_irq_chip_data(d); |
104 | 104 | ||
105 | if (gpiochip_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) { | 105 | if (gpiochip_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d))) { |
106 | dev_err(p->gpio_chip.dev, | 106 | dev_err(p->gpio_chip.parent, |
107 | "unable to lock HW IRQ %lu for IRQ\n", | 107 | "unable to lock HW IRQ %lu for IRQ\n", |
108 | irqd_to_hwirq(d)); | 108 | irqd_to_hwirq(d)); |
109 | return -EINVAL; | 109 | return -EINVAL; |
@@ -332,7 +332,7 @@ static int em_gio_probe(struct platform_device *pdev) | |||
332 | gpio_chip->request = em_gio_request; | 332 | gpio_chip->request = em_gio_request; |
333 | gpio_chip->free = em_gio_free; | 333 | gpio_chip->free = em_gio_free; |
334 | gpio_chip->label = name; | 334 | gpio_chip->label = name; |
335 | gpio_chip->dev = &pdev->dev; | 335 | gpio_chip->parent = &pdev->dev; |
336 | gpio_chip->owner = THIS_MODULE; | 336 | gpio_chip->owner = THIS_MODULE; |
337 | gpio_chip->base = -1; | 337 | gpio_chip->base = -1; |
338 | gpio_chip->ngpio = ngpios; | 338 | gpio_chip->ngpio = ngpios; |