* [PATCH] gpio: rename VIA local config struct
@ 2011-04-28 6:59 Linus Walleij
2011-05-13 14:54 ` Linus Walleij
2011-05-19 19:21 ` Grant Likely
0 siblings, 2 replies; 5+ messages in thread
From: Linus Walleij @ 2011-04-28 6:59 UTC (permalink / raw)
To: linux-arm-kernel
From: Linus Walleij <linus.walleij@linaro.org>
The local VIA GPIO config struct "gpio_config" collides with my
extension to the gpio_chip struct, so rename it to via_gpio_config
so we don't get this clash.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/video/via/via-gpio.c | 49 +++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
index c2a0a1c..4b26f3f 100644
--- a/drivers/video/via/via-gpio.c
+++ b/drivers/video/via/via-gpio.c
@@ -145,7 +145,7 @@ static int via_gpio_get(struct gpio_chip *chip, unsigned int nr)
}
-static struct viafb_gpio_cfg gpio_config = {
+static struct viafb_gpio_cfg via_gpio_config = {
.gpio_chip = {
.label = "VIAFB onboard GPIO",
.owner = THIS_MODULE,
@@ -183,8 +183,8 @@ static int viafb_gpio_resume(void *private)
{
int i;
- for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
- viafb_gpio_enable(gpio_config.active_gpios[i]);
+ for (i = 0; i < via_gpio_config.gpio_chip.ngpio; i += 2)
+ viafb_gpio_enable(via_gpio_config.active_gpios[i]);
return 0;
}
@@ -201,9 +201,9 @@ int viafb_gpio_lookup(const char *name)
{
int i;
- for (i = 0; i < gpio_config.gpio_chip.ngpio; i++)
- if (!strcmp(name, gpio_config.active_gpios[i]->vg_name))
- return gpio_config.gpio_chip.base + i;
+ for (i = 0; i < via_gpio_config.gpio_chip.ngpio; i++)
+ if (!strcmp(name, via_gpio_config.active_gpios[i]->vg_name))
+ return via_gpio_config.gpio_chip.base + i;
return -1;
}
EXPORT_SYMBOL_GPL(viafb_gpio_lookup);
@@ -229,14 +229,15 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
for (gpio = viafb_all_gpios;
gpio < viafb_all_gpios + VIAFB_NUM_GPIOS; gpio++)
if (gpio->vg_port_index == port_cfg[i].ioport_index) {
- gpio_config.active_gpios[ngpio] = gpio;
- gpio_config.gpio_names[ngpio] = gpio->vg_name;
+ via_gpio_config.active_gpios[ngpio] = gpio;
+ via_gpio_config.gpio_names[ngpio] =
+ gpio->vg_name;
ngpio++;
}
}
- gpio_config.gpio_chip.ngpio = ngpio;
- gpio_config.gpio_chip.names = gpio_config.gpio_names;
- gpio_config.vdev = vdev;
+ via_gpio_config.gpio_chip.ngpio = ngpio;
+ via_gpio_config.gpio_chip.names = via_gpio_config.gpio_names;
+ via_gpio_config.vdev = vdev;
if (ngpio == 0) {
printk(KERN_INFO "viafb: no GPIOs configured\n");
return 0;
@@ -245,18 +246,18 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
* Enable the ports. They come in pairs, with a single
* enable bit for both.
*/
- spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
+ spin_lock_irqsave(&via_gpio_config.vdev->reg_lock, flags);
for (i = 0; i < ngpio; i += 2)
- viafb_gpio_enable(gpio_config.active_gpios[i]);
- spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
+ viafb_gpio_enable(via_gpio_config.active_gpios[i]);
+ spin_unlock_irqrestore(&via_gpio_config.vdev->reg_lock, flags);
/*
* Get registered.
*/
- gpio_config.gpio_chip.base = -1; /* Dynamic */
- ret = gpiochip_add(&gpio_config.gpio_chip);
+ via_gpio_config.gpio_chip.base = -1; /* Dynamic */
+ ret = gpiochip_add(&via_gpio_config.gpio_chip);
if (ret) {
printk(KERN_ERR "viafb: failed to add gpios (%d)\n", ret);
- gpio_config.gpio_chip.ngpio = 0;
+ via_gpio_config.gpio_chip.ngpio = 0;
}
#ifdef CONFIG_PM
viafb_pm_register(&viafb_gpio_pm_hooks);
@@ -277,8 +278,8 @@ static int viafb_gpio_remove(struct platform_device *platdev)
/*
* Get unregistered.
*/
- if (gpio_config.gpio_chip.ngpio > 0) {
- ret = gpiochip_remove(&gpio_config.gpio_chip);
+ if (via_gpio_config.gpio_chip.ngpio > 0) {
+ ret = gpiochip_remove(&via_gpio_config.gpio_chip);
if (ret) { /* Somebody still using it? */
printk(KERN_ERR "Viafb: GPIO remove failed\n");
return ret;
@@ -287,11 +288,11 @@ static int viafb_gpio_remove(struct platform_device *platdev)
/*
* Disable the ports.
*/
- spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
- for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
- viafb_gpio_disable(gpio_config.active_gpios[i]);
- gpio_config.gpio_chip.ngpio = 0;
- spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
+ spin_lock_irqsave(&via_gpio_config.vdev->reg_lock, flags);
+ for (i = 0; i < via_gpio_config.gpio_chip.ngpio; i += 2)
+ viafb_gpio_disable(via_gpio_config.active_gpios[i]);
+ via_gpio_config.gpio_chip.ngpio = 0;
+ spin_unlock_irqrestore(&via_gpio_config.vdev->reg_lock, flags);
return ret;
}
--
1.7.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] gpio: rename VIA local config struct
2011-04-28 6:59 [PATCH] gpio: rename VIA local config struct Linus Walleij
@ 2011-05-13 14:54 ` Linus Walleij
2011-05-19 19:21 ` Grant Likely
1 sibling, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2011-05-13 14:54 UTC (permalink / raw)
To: linux-arm-kernel
2011/4/28 Linus Walleij <linus.walleij@stericsson.com>:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> The local VIA GPIO config struct "gpio_config" collides with my
> extension to the gpio_chip struct, so rename it to via_gpio_config
> so we don't get this clash.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Even if we're not merging anything like my configuration API for
2.6.40 IMHO this patch makes sense anyway, so please consider
applying it for bringing clarity to the source code.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] gpio: rename VIA local config struct
2011-04-28 6:59 [PATCH] gpio: rename VIA local config struct Linus Walleij
2011-05-13 14:54 ` Linus Walleij
@ 2011-05-19 19:21 ` Grant Likely
1 sibling, 0 replies; 5+ messages in thread
From: Grant Likely @ 2011-05-19 19:21 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Apr 28, 2011 at 08:59:00AM +0200, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> The local VIA GPIO config struct "gpio_config" collides with my
> extension to the gpio_chip struct, so rename it to via_gpio_config
> so we don't get this clash.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This is a good change regardless. However, one nitpick. Since the
driver already uses the "viafb_" prefix on functions, you should use
rename the structure to viafb_gpio_config too.
g.
> ---
> drivers/video/via/via-gpio.c | 49 +++++++++++++++++++++--------------------
> 1 files changed, 25 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
> index c2a0a1c..4b26f3f 100644
> --- a/drivers/video/via/via-gpio.c
> +++ b/drivers/video/via/via-gpio.c
> @@ -145,7 +145,7 @@ static int via_gpio_get(struct gpio_chip *chip, unsigned int nr)
> }
>
>
> -static struct viafb_gpio_cfg gpio_config = {
> +static struct viafb_gpio_cfg via_gpio_config = {
> .gpio_chip = {
> .label = "VIAFB onboard GPIO",
> .owner = THIS_MODULE,
> @@ -183,8 +183,8 @@ static int viafb_gpio_resume(void *private)
> {
> int i;
>
> - for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
> - viafb_gpio_enable(gpio_config.active_gpios[i]);
> + for (i = 0; i < via_gpio_config.gpio_chip.ngpio; i += 2)
> + viafb_gpio_enable(via_gpio_config.active_gpios[i]);
> return 0;
> }
>
> @@ -201,9 +201,9 @@ int viafb_gpio_lookup(const char *name)
> {
> int i;
>
> - for (i = 0; i < gpio_config.gpio_chip.ngpio; i++)
> - if (!strcmp(name, gpio_config.active_gpios[i]->vg_name))
> - return gpio_config.gpio_chip.base + i;
> + for (i = 0; i < via_gpio_config.gpio_chip.ngpio; i++)
> + if (!strcmp(name, via_gpio_config.active_gpios[i]->vg_name))
> + return via_gpio_config.gpio_chip.base + i;
> return -1;
> }
> EXPORT_SYMBOL_GPL(viafb_gpio_lookup);
> @@ -229,14 +229,15 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
> for (gpio = viafb_all_gpios;
> gpio < viafb_all_gpios + VIAFB_NUM_GPIOS; gpio++)
> if (gpio->vg_port_index == port_cfg[i].ioport_index) {
> - gpio_config.active_gpios[ngpio] = gpio;
> - gpio_config.gpio_names[ngpio] = gpio->vg_name;
> + via_gpio_config.active_gpios[ngpio] = gpio;
> + via_gpio_config.gpio_names[ngpio] =
> + gpio->vg_name;
> ngpio++;
> }
> }
> - gpio_config.gpio_chip.ngpio = ngpio;
> - gpio_config.gpio_chip.names = gpio_config.gpio_names;
> - gpio_config.vdev = vdev;
> + via_gpio_config.gpio_chip.ngpio = ngpio;
> + via_gpio_config.gpio_chip.names = via_gpio_config.gpio_names;
> + via_gpio_config.vdev = vdev;
> if (ngpio == 0) {
> printk(KERN_INFO "viafb: no GPIOs configured\n");
> return 0;
> @@ -245,18 +246,18 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
> * Enable the ports. They come in pairs, with a single
> * enable bit for both.
> */
> - spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
> + spin_lock_irqsave(&via_gpio_config.vdev->reg_lock, flags);
> for (i = 0; i < ngpio; i += 2)
> - viafb_gpio_enable(gpio_config.active_gpios[i]);
> - spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
> + viafb_gpio_enable(via_gpio_config.active_gpios[i]);
> + spin_unlock_irqrestore(&via_gpio_config.vdev->reg_lock, flags);
> /*
> * Get registered.
> */
> - gpio_config.gpio_chip.base = -1; /* Dynamic */
> - ret = gpiochip_add(&gpio_config.gpio_chip);
> + via_gpio_config.gpio_chip.base = -1; /* Dynamic */
> + ret = gpiochip_add(&via_gpio_config.gpio_chip);
> if (ret) {
> printk(KERN_ERR "viafb: failed to add gpios (%d)\n", ret);
> - gpio_config.gpio_chip.ngpio = 0;
> + via_gpio_config.gpio_chip.ngpio = 0;
> }
> #ifdef CONFIG_PM
> viafb_pm_register(&viafb_gpio_pm_hooks);
> @@ -277,8 +278,8 @@ static int viafb_gpio_remove(struct platform_device *platdev)
> /*
> * Get unregistered.
> */
> - if (gpio_config.gpio_chip.ngpio > 0) {
> - ret = gpiochip_remove(&gpio_config.gpio_chip);
> + if (via_gpio_config.gpio_chip.ngpio > 0) {
> + ret = gpiochip_remove(&via_gpio_config.gpio_chip);
> if (ret) { /* Somebody still using it? */
> printk(KERN_ERR "Viafb: GPIO remove failed\n");
> return ret;
> @@ -287,11 +288,11 @@ static int viafb_gpio_remove(struct platform_device *platdev)
> /*
> * Disable the ports.
> */
> - spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
> - for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
> - viafb_gpio_disable(gpio_config.active_gpios[i]);
> - gpio_config.gpio_chip.ngpio = 0;
> - spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
> + spin_lock_irqsave(&via_gpio_config.vdev->reg_lock, flags);
> + for (i = 0; i < via_gpio_config.gpio_chip.ngpio; i += 2)
> + viafb_gpio_disable(via_gpio_config.active_gpios[i]);
> + via_gpio_config.gpio_chip.ngpio = 0;
> + spin_unlock_irqrestore(&via_gpio_config.vdev->reg_lock, flags);
> return ret;
> }
>
> --
> 1.7.3.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] gpio: rename VIA local config struct
@ 2011-05-19 19:59 Linus Walleij
2011-05-19 21:05 ` Grant Likely
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2011-05-19 19:59 UTC (permalink / raw)
To: linux-arm-kernel
From: Linus Walleij <linus.walleij@linaro.org>
The local VIA GPIO config struct "gpio_config" collides with my
extension to the gpio_chip struct, so rename it to
viafb_gpio_config so we don't get this clash.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/video/via/via-gpio.c | 49 +++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
index c2a0a1c..ab53418 100644
--- a/drivers/video/via/via-gpio.c
+++ b/drivers/video/via/via-gpio.c
@@ -145,7 +145,7 @@ static int via_gpio_get(struct gpio_chip *chip, unsigned int nr)
}
-static struct viafb_gpio_cfg gpio_config = {
+static struct viafb_gpio_cfg viafb_gpio_config = {
.gpio_chip = {
.label = "VIAFB onboard GPIO",
.owner = THIS_MODULE,
@@ -183,8 +183,8 @@ static int viafb_gpio_resume(void *private)
{
int i;
- for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
- viafb_gpio_enable(gpio_config.active_gpios[i]);
+ for (i = 0; i < viafb_gpio_config.gpio_chip.ngpio; i += 2)
+ viafb_gpio_enable(viafb_gpio_config.active_gpios[i]);
return 0;
}
@@ -201,9 +201,9 @@ int viafb_gpio_lookup(const char *name)
{
int i;
- for (i = 0; i < gpio_config.gpio_chip.ngpio; i++)
- if (!strcmp(name, gpio_config.active_gpios[i]->vg_name))
- return gpio_config.gpio_chip.base + i;
+ for (i = 0; i < viafb_gpio_config.gpio_chip.ngpio; i++)
+ if (!strcmp(name, viafb_gpio_config.active_gpios[i]->vg_name))
+ return viafb_gpio_config.gpio_chip.base + i;
return -1;
}
EXPORT_SYMBOL_GPL(viafb_gpio_lookup);
@@ -229,14 +229,15 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
for (gpio = viafb_all_gpios;
gpio < viafb_all_gpios + VIAFB_NUM_GPIOS; gpio++)
if (gpio->vg_port_index == port_cfg[i].ioport_index) {
- gpio_config.active_gpios[ngpio] = gpio;
- gpio_config.gpio_names[ngpio] = gpio->vg_name;
+ viafb_gpio_config.active_gpios[ngpio] = gpio;
+ viafb_gpio_config.gpio_names[ngpio] =
+ gpio->vg_name;
ngpio++;
}
}
- gpio_config.gpio_chip.ngpio = ngpio;
- gpio_config.gpio_chip.names = gpio_config.gpio_names;
- gpio_config.vdev = vdev;
+ viafb_gpio_config.gpio_chip.ngpio = ngpio;
+ viafb_gpio_config.gpio_chip.names = viafb_gpio_config.gpio_names;
+ viafb_gpio_config.vdev = vdev;
if (ngpio == 0) {
printk(KERN_INFO "viafb: no GPIOs configured\n");
return 0;
@@ -245,18 +246,18 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
* Enable the ports. They come in pairs, with a single
* enable bit for both.
*/
- spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
+ spin_lock_irqsave(&viafb_gpio_config.vdev->reg_lock, flags);
for (i = 0; i < ngpio; i += 2)
- viafb_gpio_enable(gpio_config.active_gpios[i]);
- spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
+ viafb_gpio_enable(viafb_gpio_config.active_gpios[i]);
+ spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
/*
* Get registered.
*/
- gpio_config.gpio_chip.base = -1; /* Dynamic */
- ret = gpiochip_add(&gpio_config.gpio_chip);
+ viafb_gpio_config.gpio_chip.base = -1; /* Dynamic */
+ ret = gpiochip_add(&viafb_gpio_config.gpio_chip);
if (ret) {
printk(KERN_ERR "viafb: failed to add gpios (%d)\n", ret);
- gpio_config.gpio_chip.ngpio = 0;
+ viafb_gpio_config.gpio_chip.ngpio = 0;
}
#ifdef CONFIG_PM
viafb_pm_register(&viafb_gpio_pm_hooks);
@@ -277,8 +278,8 @@ static int viafb_gpio_remove(struct platform_device *platdev)
/*
* Get unregistered.
*/
- if (gpio_config.gpio_chip.ngpio > 0) {
- ret = gpiochip_remove(&gpio_config.gpio_chip);
+ if (viafb_gpio_config.gpio_chip.ngpio > 0) {
+ ret = gpiochip_remove(&viafb_gpio_config.gpio_chip);
if (ret) { /* Somebody still using it? */
printk(KERN_ERR "Viafb: GPIO remove failed\n");
return ret;
@@ -287,11 +288,11 @@ static int viafb_gpio_remove(struct platform_device *platdev)
/*
* Disable the ports.
*/
- spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
- for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
- viafb_gpio_disable(gpio_config.active_gpios[i]);
- gpio_config.gpio_chip.ngpio = 0;
- spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
+ spin_lock_irqsave(&viafb_gpio_config.vdev->reg_lock, flags);
+ for (i = 0; i < viafb_gpio_config.gpio_chip.ngpio; i += 2)
+ viafb_gpio_disable(viafb_gpio_config.active_gpios[i]);
+ viafb_gpio_config.gpio_chip.ngpio = 0;
+ spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
return ret;
}
--
1.7.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] gpio: rename VIA local config struct
2011-05-19 19:59 Linus Walleij
@ 2011-05-19 21:05 ` Grant Likely
0 siblings, 0 replies; 5+ messages in thread
From: Grant Likely @ 2011-05-19 21:05 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 19, 2011 at 09:59:35PM +0200, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> The local VIA GPIO config struct "gpio_config" collides with my
> extension to the gpio_chip struct, so rename it to
> viafb_gpio_config so we don't get this clash.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Applied, thanks.
g.
> ---
> drivers/video/via/via-gpio.c | 49 +++++++++++++++++++++--------------------
> 1 files changed, 25 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
> index c2a0a1c..ab53418 100644
> --- a/drivers/video/via/via-gpio.c
> +++ b/drivers/video/via/via-gpio.c
> @@ -145,7 +145,7 @@ static int via_gpio_get(struct gpio_chip *chip, unsigned int nr)
> }
>
>
> -static struct viafb_gpio_cfg gpio_config = {
> +static struct viafb_gpio_cfg viafb_gpio_config = {
> .gpio_chip = {
> .label = "VIAFB onboard GPIO",
> .owner = THIS_MODULE,
> @@ -183,8 +183,8 @@ static int viafb_gpio_resume(void *private)
> {
> int i;
>
> - for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
> - viafb_gpio_enable(gpio_config.active_gpios[i]);
> + for (i = 0; i < viafb_gpio_config.gpio_chip.ngpio; i += 2)
> + viafb_gpio_enable(viafb_gpio_config.active_gpios[i]);
> return 0;
> }
>
> @@ -201,9 +201,9 @@ int viafb_gpio_lookup(const char *name)
> {
> int i;
>
> - for (i = 0; i < gpio_config.gpio_chip.ngpio; i++)
> - if (!strcmp(name, gpio_config.active_gpios[i]->vg_name))
> - return gpio_config.gpio_chip.base + i;
> + for (i = 0; i < viafb_gpio_config.gpio_chip.ngpio; i++)
> + if (!strcmp(name, viafb_gpio_config.active_gpios[i]->vg_name))
> + return viafb_gpio_config.gpio_chip.base + i;
> return -1;
> }
> EXPORT_SYMBOL_GPL(viafb_gpio_lookup);
> @@ -229,14 +229,15 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
> for (gpio = viafb_all_gpios;
> gpio < viafb_all_gpios + VIAFB_NUM_GPIOS; gpio++)
> if (gpio->vg_port_index == port_cfg[i].ioport_index) {
> - gpio_config.active_gpios[ngpio] = gpio;
> - gpio_config.gpio_names[ngpio] = gpio->vg_name;
> + viafb_gpio_config.active_gpios[ngpio] = gpio;
> + viafb_gpio_config.gpio_names[ngpio] =
> + gpio->vg_name;
> ngpio++;
> }
> }
> - gpio_config.gpio_chip.ngpio = ngpio;
> - gpio_config.gpio_chip.names = gpio_config.gpio_names;
> - gpio_config.vdev = vdev;
> + viafb_gpio_config.gpio_chip.ngpio = ngpio;
> + viafb_gpio_config.gpio_chip.names = viafb_gpio_config.gpio_names;
> + viafb_gpio_config.vdev = vdev;
> if (ngpio == 0) {
> printk(KERN_INFO "viafb: no GPIOs configured\n");
> return 0;
> @@ -245,18 +246,18 @@ static __devinit int viafb_gpio_probe(struct platform_device *platdev)
> * Enable the ports. They come in pairs, with a single
> * enable bit for both.
> */
> - spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
> + spin_lock_irqsave(&viafb_gpio_config.vdev->reg_lock, flags);
> for (i = 0; i < ngpio; i += 2)
> - viafb_gpio_enable(gpio_config.active_gpios[i]);
> - spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
> + viafb_gpio_enable(viafb_gpio_config.active_gpios[i]);
> + spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
> /*
> * Get registered.
> */
> - gpio_config.gpio_chip.base = -1; /* Dynamic */
> - ret = gpiochip_add(&gpio_config.gpio_chip);
> + viafb_gpio_config.gpio_chip.base = -1; /* Dynamic */
> + ret = gpiochip_add(&viafb_gpio_config.gpio_chip);
> if (ret) {
> printk(KERN_ERR "viafb: failed to add gpios (%d)\n", ret);
> - gpio_config.gpio_chip.ngpio = 0;
> + viafb_gpio_config.gpio_chip.ngpio = 0;
> }
> #ifdef CONFIG_PM
> viafb_pm_register(&viafb_gpio_pm_hooks);
> @@ -277,8 +278,8 @@ static int viafb_gpio_remove(struct platform_device *platdev)
> /*
> * Get unregistered.
> */
> - if (gpio_config.gpio_chip.ngpio > 0) {
> - ret = gpiochip_remove(&gpio_config.gpio_chip);
> + if (viafb_gpio_config.gpio_chip.ngpio > 0) {
> + ret = gpiochip_remove(&viafb_gpio_config.gpio_chip);
> if (ret) { /* Somebody still using it? */
> printk(KERN_ERR "Viafb: GPIO remove failed\n");
> return ret;
> @@ -287,11 +288,11 @@ static int viafb_gpio_remove(struct platform_device *platdev)
> /*
> * Disable the ports.
> */
> - spin_lock_irqsave(&gpio_config.vdev->reg_lock, flags);
> - for (i = 0; i < gpio_config.gpio_chip.ngpio; i += 2)
> - viafb_gpio_disable(gpio_config.active_gpios[i]);
> - gpio_config.gpio_chip.ngpio = 0;
> - spin_unlock_irqrestore(&gpio_config.vdev->reg_lock, flags);
> + spin_lock_irqsave(&viafb_gpio_config.vdev->reg_lock, flags);
> + for (i = 0; i < viafb_gpio_config.gpio_chip.ngpio; i += 2)
> + viafb_gpio_disable(viafb_gpio_config.active_gpios[i]);
> + viafb_gpio_config.gpio_chip.ngpio = 0;
> + spin_unlock_irqrestore(&viafb_gpio_config.vdev->reg_lock, flags);
> return ret;
> }
>
> --
> 1.7.3.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-05-19 21:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-28 6:59 [PATCH] gpio: rename VIA local config struct Linus Walleij
2011-05-13 14:54 ` Linus Walleij
2011-05-19 19:21 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2011-05-19 19:59 Linus Walleij
2011-05-19 21:05 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).