Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 12610be33df5563d3f8cb141f231d4dc5b2a317f

Authored by Linus Walleij
Committed by Grant Likely
1 parent 5523f86bea
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

gpio/74x164: fix clash with gpiolib namespace 

The 74x164 GPIO driver has a static inline helper called
gpio_to_chip which clashes with the gpiolib namespace if we
try to expose the function with the same name from gpiolib,
and it's still confusing even if we don't do that. So rename
it to gpio_to_74x164_chip().

Reported-by: H Hartley Sweeten <hartleys@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/gpio/gpio-74x164.c
Diff comments   View file @ 12610be
... ... @@ -23,7 +23,7 @@
23 23 u8 port_config;
24 24 };
25 25  
26   -static struct gen_74x164_chip *gpio_to_chip(struct gpio_chip *gc)
  26 +static struct gen_74x164_chip *gpio_to_74x164_chip(struct gpio_chip *gc)
27 27 {
28 28 return container_of(gc, struct gen_74x164_chip, gpio_chip);
29 29 }
... ... @@ -36,7 +36,7 @@
36 36  
37 37 static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset)
38 38 {
39   - struct gen_74x164_chip *chip = gpio_to_chip(gc);
  39 + struct gen_74x164_chip *chip = gpio_to_74x164_chip(gc);
40 40 int ret;
41 41  
42 42 mutex_lock(&chip->lock);
... ... @@ -49,7 +49,7 @@
49 49 static void gen_74x164_set_value(struct gpio_chip *gc,
50 50 unsigned offset, int val)
51 51 {
52   - struct gen_74x164_chip *chip = gpio_to_chip(gc);
  52 + struct gen_74x164_chip *chip = gpio_to_74x164_chip(gc);
53 53  
54 54 mutex_lock(&chip->lock);
55 55 if (val)