| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20110519192149.GN5109@ponder.secretlab.ca>
Date: Thu, 19 May 2011 13:21:49 -0600
From: Grant Likely <grant.likely@...retlab.ca>
To: Linus Walleij <linus.walleij@...ricsson.com>
Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Lee Jones <lee.jones@...aro.org>,
Linus Walleij <linus.walleij@...aro.org>
Subject: Re: [PATCH] gpio: rename VIA local config struct
On Thu, Apr 28, 2011 at 08:59:00AM +0200, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@...aro.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@...aro.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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists