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-amdpt.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-amdpt.c')
-rw-r--r-- | drivers/gpio/gpio-amdpt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpio/gpio-amdpt.c b/drivers/gpio/gpio-amdpt.c index cbbb966d4fc0..f842ccc45e64 100644 --- a/drivers/gpio/gpio-amdpt.c +++ b/drivers/gpio/gpio-amdpt.c | |||
@@ -39,14 +39,14 @@ static int pt_gpio_request(struct gpio_chip *gc, unsigned offset) | |||
39 | unsigned long flags; | 39 | unsigned long flags; |
40 | u32 using_pins; | 40 | u32 using_pins; |
41 | 41 | ||
42 | dev_dbg(gc->dev, "pt_gpio_request offset=%x\n", offset); | 42 | dev_dbg(gc->parent, "pt_gpio_request offset=%x\n", offset); |
43 | 43 | ||
44 | spin_lock_irqsave(&pt_gpio->lock, flags); | 44 | spin_lock_irqsave(&pt_gpio->lock, flags); |
45 | 45 | ||
46 | using_pins = readl(pt_gpio->reg_base + PT_SYNC_REG); | 46 | using_pins = readl(pt_gpio->reg_base + PT_SYNC_REG); |
47 | if (using_pins & BIT(offset)) { | 47 | if (using_pins & BIT(offset)) { |
48 | dev_warn(gc->dev, "PT GPIO pin %x reconfigured\n", | 48 | dev_warn(gc->parent, "PT GPIO pin %x reconfigured\n", |
49 | offset); | 49 | offset); |
50 | spin_unlock_irqrestore(&pt_gpio->lock, flags); | 50 | spin_unlock_irqrestore(&pt_gpio->lock, flags); |
51 | return -EINVAL; | 51 | return -EINVAL; |
52 | } | 52 | } |
@@ -72,7 +72,7 @@ static void pt_gpio_free(struct gpio_chip *gc, unsigned offset) | |||
72 | 72 | ||
73 | spin_unlock_irqrestore(&pt_gpio->lock, flags); | 73 | spin_unlock_irqrestore(&pt_gpio->lock, flags); |
74 | 74 | ||
75 | dev_dbg(gc->dev, "pt_gpio_free offset=%x\n", offset); | 75 | dev_dbg(gc->parent, "pt_gpio_free offset=%x\n", offset); |
76 | } | 76 | } |
77 | 77 | ||
78 | static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value) | 78 | static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value) |
@@ -81,7 +81,7 @@ static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value) | |||
81 | unsigned long flags; | 81 | unsigned long flags; |
82 | u32 data; | 82 | u32 data; |
83 | 83 | ||
84 | dev_dbg(gc->dev, "pt_gpio_set_value offset=%x, value=%x\n", | 84 | dev_dbg(gc->parent, "pt_gpio_set_value offset=%x, value=%x\n", |
85 | offset, value); | 85 | offset, value); |
86 | 86 | ||
87 | spin_lock_irqsave(&pt_gpio->lock, flags); | 87 | spin_lock_irqsave(&pt_gpio->lock, flags); |
@@ -116,7 +116,7 @@ static int pt_gpio_get_value(struct gpio_chip *gc, unsigned offset) | |||
116 | data >>= offset; | 116 | data >>= offset; |
117 | data &= 1; | 117 | data &= 1; |
118 | 118 | ||
119 | dev_dbg(gc->dev, "pt_gpio_get_value offset=%x, value=%x\n", | 119 | dev_dbg(gc->parent, "pt_gpio_get_value offset=%x, value=%x\n", |
120 | offset, data); | 120 | offset, data); |
121 | 121 | ||
122 | return data; | 122 | return data; |
@@ -128,7 +128,7 @@ static int pt_gpio_direction_input(struct gpio_chip *gc, unsigned offset) | |||
128 | unsigned long flags; | 128 | unsigned long flags; |
129 | u32 data; | 129 | u32 data; |
130 | 130 | ||
131 | dev_dbg(gc->dev, "pt_gpio_dirction_input offset=%x\n", offset); | 131 | dev_dbg(gc->parent, "pt_gpio_dirction_input offset=%x\n", offset); |
132 | 132 | ||
133 | spin_lock_irqsave(&pt_gpio->lock, flags); | 133 | spin_lock_irqsave(&pt_gpio->lock, flags); |
134 | 134 | ||
@@ -148,7 +148,7 @@ static int pt_gpio_direction_output(struct gpio_chip *gc, | |||
148 | unsigned long flags; | 148 | unsigned long flags; |
149 | u32 data; | 149 | u32 data; |
150 | 150 | ||
151 | dev_dbg(gc->dev, "pt_gpio_direction_output offset=%x, value=%x\n", | 151 | dev_dbg(gc->parent, "pt_gpio_direction_output offset=%x, value=%x\n", |
152 | offset, value); | 152 | offset, value); |
153 | 153 | ||
154 | spin_lock_irqsave(&pt_gpio->lock, flags); | 154 | spin_lock_irqsave(&pt_gpio->lock, flags); |
@@ -202,7 +202,7 @@ static int pt_gpio_probe(struct platform_device *pdev) | |||
202 | 202 | ||
203 | pt_gpio->gc.label = pdev->name; | 203 | pt_gpio->gc.label = pdev->name; |
204 | pt_gpio->gc.owner = THIS_MODULE; | 204 | pt_gpio->gc.owner = THIS_MODULE; |
205 | pt_gpio->gc.dev = dev; | 205 | pt_gpio->gc.parent = dev; |
206 | pt_gpio->gc.request = pt_gpio_request; | 206 | pt_gpio->gc.request = pt_gpio_request; |
207 | pt_gpio->gc.free = pt_gpio_free; | 207 | pt_gpio->gc.free = pt_gpio_free; |
208 | pt_gpio->gc.direction_input = pt_gpio_direction_input; | 208 | pt_gpio->gc.direction_input = pt_gpio_direction_input; |