Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
  gpio/via: rename VIA local config struct
  basic_mmio_gpio: split into a gpio library and platform device
  gpio: remove some legacy comments in build files
  gpio: add trace events for setting direction and value
  gpio/pca953x: Use handle_simple_irq instead of handle_edge_irq
  gpiolib: export gpiochip_find
  gpio: remove redundant Kconfig depends on GPIOLIB
  basic_mmio_gpio: convert to non-__raw* accessors
  basic_mmio_gpio: support direction registers
  basic_mmio_gpio: support different input/output registers
  basic_mmio_gpio: detect output method at probe time
  basic_mmio_gpio: request register regions
  basic_mmio_gpio: allow overriding number of gpio
  basic_mmio_gpio: convert to platform_{get,set}_drvdata()
  basic_mmio_gpio: remove runtime width/endianness evaluation

1 files changed, 25 insertions, 24 deletions

diff --git a/drivers/video/via/via-gpio.c b/drivers/video/via/via-gpio.c
index c2a0a1cfd3b3..ab5341814c74 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;
 }