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/pinctrl/pinctrl-at91-pio4.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/pinctrl/pinctrl-at91-pio4.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-at91-pio4.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 33edd07d9149..f1daf8580167 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c | |||
@@ -290,7 +290,7 @@ static void atmel_gpio_irq_handler(struct irq_desc *desc) | |||
290 | 290 | ||
291 | static int atmel_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | 291 | static int atmel_gpio_direction_input(struct gpio_chip *chip, unsigned offset) |
292 | { | 292 | { |
293 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->dev); | 293 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->parent); |
294 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; | 294 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; |
295 | unsigned reg; | 295 | unsigned reg; |
296 | 296 | ||
@@ -305,7 +305,7 @@ static int atmel_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | |||
305 | 305 | ||
306 | static int atmel_gpio_get(struct gpio_chip *chip, unsigned offset) | 306 | static int atmel_gpio_get(struct gpio_chip *chip, unsigned offset) |
307 | { | 307 | { |
308 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->dev); | 308 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->parent); |
309 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; | 309 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; |
310 | unsigned reg; | 310 | unsigned reg; |
311 | 311 | ||
@@ -317,7 +317,7 @@ static int atmel_gpio_get(struct gpio_chip *chip, unsigned offset) | |||
317 | static int atmel_gpio_direction_output(struct gpio_chip *chip, unsigned offset, | 317 | static int atmel_gpio_direction_output(struct gpio_chip *chip, unsigned offset, |
318 | int value) | 318 | int value) |
319 | { | 319 | { |
320 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->dev); | 320 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->parent); |
321 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; | 321 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; |
322 | unsigned reg; | 322 | unsigned reg; |
323 | 323 | ||
@@ -336,7 +336,7 @@ static int atmel_gpio_direction_output(struct gpio_chip *chip, unsigned offset, | |||
336 | 336 | ||
337 | static void atmel_gpio_set(struct gpio_chip *chip, unsigned offset, int val) | 337 | static void atmel_gpio_set(struct gpio_chip *chip, unsigned offset, int val) |
338 | { | 338 | { |
339 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->dev); | 339 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->parent); |
340 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; | 340 | struct atmel_pin *pin = atmel_pioctrl->pins[offset]; |
341 | 341 | ||
342 | atmel_gpio_write(atmel_pioctrl, pin->bank, | 342 | atmel_gpio_write(atmel_pioctrl, pin->bank, |
@@ -346,7 +346,7 @@ static void atmel_gpio_set(struct gpio_chip *chip, unsigned offset, int val) | |||
346 | 346 | ||
347 | static int atmel_gpio_to_irq(struct gpio_chip *chip, unsigned offset) | 347 | static int atmel_gpio_to_irq(struct gpio_chip *chip, unsigned offset) |
348 | { | 348 | { |
349 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->dev); | 349 | struct atmel_pioctrl *atmel_pioctrl = dev_get_drvdata(chip->parent); |
350 | 350 | ||
351 | return irq_find_mapping(atmel_pioctrl->irq_domain, offset); | 351 | return irq_find_mapping(atmel_pioctrl->irq_domain, offset); |
352 | } | 352 | } |
@@ -969,7 +969,7 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) | |||
969 | atmel_pioctrl->gpio_chip->of_node = dev->of_node; | 969 | atmel_pioctrl->gpio_chip->of_node = dev->of_node; |
970 | atmel_pioctrl->gpio_chip->ngpio = atmel_pioctrl->npins; | 970 | atmel_pioctrl->gpio_chip->ngpio = atmel_pioctrl->npins; |
971 | atmel_pioctrl->gpio_chip->label = dev_name(dev); | 971 | atmel_pioctrl->gpio_chip->label = dev_name(dev); |
972 | atmel_pioctrl->gpio_chip->dev = dev; | 972 | atmel_pioctrl->gpio_chip->parent = dev; |
973 | atmel_pioctrl->gpio_chip->names = atmel_pioctrl->group_names; | 973 | atmel_pioctrl->gpio_chip->names = atmel_pioctrl->group_names; |
974 | 974 | ||
975 | atmel_pioctrl->pm_wakeup_sources = devm_kzalloc(dev, | 975 | atmel_pioctrl->pm_wakeup_sources = devm_kzalloc(dev, |