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-dln2.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-dln2.c')
-rw-r--r-- | drivers/gpio/gpio-dln2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-dln2.c b/drivers/gpio/gpio-dln2.c index 6685712c15cf..e541af03dd45 100644 --- a/drivers/gpio/gpio-dln2.c +++ b/drivers/gpio/gpio-dln2.c | |||
@@ -377,7 +377,7 @@ static void dln2_irq_bus_unlock(struct irq_data *irqd) | |||
377 | 377 | ||
378 | ret = dln2_gpio_set_event_cfg(dln2, pin, type, 0); | 378 | ret = dln2_gpio_set_event_cfg(dln2, pin, type, 0); |
379 | if (ret) | 379 | if (ret) |
380 | dev_err(dln2->gpio.dev, "failed to set event\n"); | 380 | dev_err(dln2->gpio.parent, "failed to set event\n"); |
381 | } | 381 | } |
382 | 382 | ||
383 | mutex_unlock(&dln2->irq_lock); | 383 | mutex_unlock(&dln2->irq_lock); |
@@ -406,19 +406,19 @@ static void dln2_gpio_event(struct platform_device *pdev, u16 echo, | |||
406 | struct dln2_gpio *dln2 = platform_get_drvdata(pdev); | 406 | struct dln2_gpio *dln2 = platform_get_drvdata(pdev); |
407 | 407 | ||
408 | if (len < sizeof(*event)) { | 408 | if (len < sizeof(*event)) { |
409 | dev_err(dln2->gpio.dev, "short event message\n"); | 409 | dev_err(dln2->gpio.parent, "short event message\n"); |
410 | return; | 410 | return; |
411 | } | 411 | } |
412 | 412 | ||
413 | pin = le16_to_cpu(event->pin); | 413 | pin = le16_to_cpu(event->pin); |
414 | if (pin >= dln2->gpio.ngpio) { | 414 | if (pin >= dln2->gpio.ngpio) { |
415 | dev_err(dln2->gpio.dev, "out of bounds pin %d\n", pin); | 415 | dev_err(dln2->gpio.parent, "out of bounds pin %d\n", pin); |
416 | return; | 416 | return; |
417 | } | 417 | } |
418 | 418 | ||
419 | irq = irq_find_mapping(dln2->gpio.irqdomain, pin); | 419 | irq = irq_find_mapping(dln2->gpio.irqdomain, pin); |
420 | if (!irq) { | 420 | if (!irq) { |
421 | dev_err(dln2->gpio.dev, "pin %d not mapped to IRQ\n", pin); | 421 | dev_err(dln2->gpio.parent, "pin %d not mapped to IRQ\n", pin); |
422 | return; | 422 | return; |
423 | } | 423 | } |
424 | 424 | ||
@@ -462,7 +462,7 @@ static int dln2_gpio_probe(struct platform_device *pdev) | |||
462 | dln2->pdev = pdev; | 462 | dln2->pdev = pdev; |
463 | 463 | ||
464 | dln2->gpio.label = "dln2"; | 464 | dln2->gpio.label = "dln2"; |
465 | dln2->gpio.dev = dev; | 465 | dln2->gpio.parent = dev; |
466 | dln2->gpio.owner = THIS_MODULE; | 466 | dln2->gpio.owner = THIS_MODULE; |
467 | dln2->gpio.base = -1; | 467 | dln2->gpio.base = -1; |
468 | dln2->gpio.ngpio = pins; | 468 | dln2->gpio.ngpio = pins; |