gpio: rename VIA local config struct

Message ID	1305835175-31351-1-git-send-email-linus.walleij@stericsson.com (mailing list archive)
State	New, archived
Headers	show Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4JK29TO007134 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 19 May 2011 20:02:30 GMT From: Linus Walleij <linus.walleij@stericsson.com> To: Grant Likely <grant.likely@secretlab.ca>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org> Subject: [PATCH] gpio: rename VIA local config struct Date: Thu, 19 May 2011 21:59:35 +0200 Message-ID: <1305835175-31351-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.115 listed in list.dnswl.org] Cc: Linus Walleij <linus.walleij@linaro.org>, Lee Jones <lee.jones@linaro.org> Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Message ID

1305835175-31351-1-git-send-email-linus.walleij@stericsson.com (mailing list archive)

State

New, archived

Headers

From: Linus Walleij <linus.walleij@stericsson.com>
To: Grant Likely <grant.likely@secretlab.ca>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH] gpio: rename VIA local config struct
Date: Thu, 19 May 2011 21:59:35 +0200
Message-ID: <1305835175-31351-1-git-send-email-linus.walleij@stericsson.com>
MIME-Version: 1.0
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Lee Jones <lee.jones@linaro.org>
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: linux-arm-kernel-bounces@lists.infradead.org
Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org

Commit Message

Linus Walleij May 19, 2011, 7:59 p.m. UTC

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(-)

Comments

Grant Likely May 19, 2011, 9:05 p.m. UTC | #1

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
>

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;
 }

gpio: rename VIA local config struct

Commit Message

Comments

Patch