aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/htc-i2cpld.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-11-04 03:56:26 -0500
committerLinus Walleij <linus.walleij@linaro.org>2015-11-19 03:24:35 -0500
commit58383c78425e4ee1c077253cf297b641c861c02e (patch)
tree606949d2c6db8176c0659eaa935d022bf6d19974 /drivers/mfd/htc-i2cpld.c
parent8005c49d9aea74d382f474ce11afbbc7d7130bec (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/mfd/htc-i2cpld.c')
-rw-r--r--drivers/mfd/htc-i2cpld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index 0c6ff727b2ec..bd6b96d07ab8 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -429,7 +429,7 @@ static int htcpld_register_chip_gpio(
429 /* Setup the GPIO chips */ 429 /* Setup the GPIO chips */
430 gpio_chip = &(chip->chip_out); 430 gpio_chip = &(chip->chip_out);
431 gpio_chip->label = "htcpld-out"; 431 gpio_chip->label = "htcpld-out";
432 gpio_chip->dev = dev; 432 gpio_chip->parent = dev;
433 gpio_chip->owner = THIS_MODULE; 433 gpio_chip->owner = THIS_MODULE;
434 gpio_chip->get = htcpld_chip_get; 434 gpio_chip->get = htcpld_chip_get;
435 gpio_chip->set = htcpld_chip_set; 435 gpio_chip->set = htcpld_chip_set;
@@ -440,7 +440,7 @@ static int htcpld_register_chip_gpio(
440 440
441 gpio_chip = &(chip->chip_in); 441 gpio_chip = &(chip->chip_in);
442 gpio_chip->label = "htcpld-in"; 442 gpio_chip->label = "htcpld-in";
443 gpio_chip->dev = dev; 443 gpio_chip->parent = dev;
444 gpio_chip->owner = THIS_MODULE; 444 gpio_chip->owner = THIS_MODULE;
445 gpio_chip->get = htcpld_chip_get; 445 gpio_chip->get = htcpld_chip_get;
446 gpio_chip->set = NULL; 446 gpio_chip->set = NULL;