[SCSI] libfc: fixes unnecessary seq id jump

[safe/jmp/linux-2.6] / drivers / of / gpio.c

diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index 7cd7301..a1b31a4 100644 (file)
--- a/drivers/of/gpio.c
+++ b/drivers/of/gpio.c
@@ -15,25 +15,29 @@
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/slab.h>
 #include <linux/of_gpio.h>
 #include <asm/prom.h>
 
 /**
- * of_get_gpio - Get a GPIO number from the device tree to use with GPIO API
+ * of_get_gpio_flags - Get a GPIO number and flags to use with GPIO API
  * @np:                device node to get GPIO from
  * @index:     index of the GPIO
+ * @flags:     a flags pointer to fill in
  *
  * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
- * value on the error condition.
+ * value on the error condition. If @flags is not NULL the function also fills
+ * in flags for the GPIO.
  */
-int of_get_gpio(struct device_node *np, int index)
+int of_get_gpio_flags(struct device_node *np, int index,
+                     enum of_gpio_flags *flags)
 {
        int ret;
        struct device_node *gc;
        struct of_gpio_chip *of_gc = NULL;
        int size;
        const void *gpio_spec;
-       const u32 *gpio_cells;
+       const __be32 *gpio_cells;
 
        ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells", index,
                                          &gc, &gpio_spec);
@@ -52,14 +56,18 @@ int of_get_gpio(struct device_node *np, int index)
 
        gpio_cells = of_get_property(gc, "#gpio-cells", &size);
        if (!gpio_cells || size != sizeof(*gpio_cells) ||
-                       *gpio_cells != of_gc->gpio_cells) {
+                       be32_to_cpup(gpio_cells) != of_gc->gpio_cells) {
                pr_debug("%s: wrong #gpio-cells for %s\n",
                         np->full_name, gc->full_name);
                ret = -EINVAL;
                goto err1;
        }
 
-       ret = of_gc->xlate(of_gc, np, gpio_spec);
+       /* .xlate might decide to not fill in the flags, so clear it. */
+       if (flags)
+               *flags = 0;
+
+       ret = of_gc->xlate(of_gc, np, gpio_spec, flags);
        if (ret < 0)
                goto err1;
 
@@ -70,27 +78,77 @@ err0:
        pr_debug("%s exited with status %d\n", __func__, ret);
        return ret;
 }
-EXPORT_SYMBOL(of_get_gpio);
+EXPORT_SYMBOL(of_get_gpio_flags);
+
+/**
+ * of_gpio_count - Count GPIOs for a device
+ * @np:                device node to count GPIOs for
+ *
+ * The function returns the count of GPIOs specified for a node.
+ *
+ * Note that the empty GPIO specifiers counts too. For example,
+ *
+ * gpios = <0
+ *          &pio1 1 2
+ *          0
+ *          &pio2 3 4>;
+ *
+ * defines four GPIOs (so this function will return 4), two of which
+ * are not specified.
+ */
+unsigned int of_gpio_count(struct device_node *np)
+{
+       unsigned int cnt = 0;
+
+       do {
+               int ret;
+
+               ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells",
+                                                 cnt, NULL, NULL);
+               /* A hole in the gpios = <> counts anyway. */
+               if (ret < 0 && ret != -EEXIST)
+                       break;
+       } while (++cnt);
+
+       return cnt;
+}
+EXPORT_SYMBOL(of_gpio_count);
 
 /**
- * of_gpio_simple_xlate - translate gpio_spec to the GPIO number
+ * of_gpio_simple_xlate - translate gpio_spec to the GPIO number and flags
  * @of_gc:     pointer to the of_gpio_chip structure
  * @np:                device node of the GPIO chip
  * @gpio_spec: gpio specifier as found in the device tree
+ * @flags:     a flags pointer to fill in
  *
  * This is simple translation function, suitable for the most 1:1 mapped
  * gpio chips. This function performs only one sanity check: whether gpio
  * is less than ngpios (that is specified in the gpio_chip).
  */
 int of_gpio_simple_xlate(struct of_gpio_chip *of_gc, struct device_node *np,
-                        const void *gpio_spec)
+                        const void *gpio_spec, enum of_gpio_flags *flags)
 {
-       const u32 *gpio = gpio_spec;
+       const __be32 *gpio = gpio_spec;
+       const u32 n = be32_to_cpup(gpio);
+
+       /*
+        * We're discouraging gpio_cells < 2, since that way you'll have to
+        * write your own xlate function (that will have to retrive the GPIO
+        * number and the flags from a single gpio cell -- this is possible,
+        * but not recommended).
+        */
+       if (of_gc->gpio_cells < 2) {
+               WARN_ON(1);
+               return -EINVAL;
+       }
 
-       if (*gpio > of_gc->gc.ngpio)
+       if (n > of_gc->gc.ngpio)
                return -EINVAL;
 
-       return *gpio;
+       if (flags)
+               *flags = be32_to_cpu(gpio[1]);
+
+       return n;
 }
 EXPORT_SYMBOL(of_gpio_simple_xlate);