[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <52587C37.3070606@nvidia.com>
Date: Fri, 11 Oct 2013 15:31:19 -0700
From: Alex Courbot <acourbot@...dia.com>
To: Alexandre Courbot <acourbot@...dia.com>,
Linus Walleij <linus.walleij@...aro.org>
CC: Arnd Bergmann <arnd@...db.de>,
Grant Likely <grant.likely@...aro.org>,
Mika Westerberg <mika.westerberg@...ux.intel.com>,
"gnurou@...il.com" <gnurou@...il.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
Mathias Nyman <mathias.nyman@...ux.intel.com>,
"linux-gpio@...r.kernel.org" <linux-gpio@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-arch@...r.kernel.org" <linux-arch@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>
Subject: Re: [PATCH v2 3/3] gpiolib: add gpiod_get() and gpiod_put() functions
> +#else
> +static struct device_node *of_find_gpio(struct device *dev, const char *id
> + unsigned int idx, unsigned long flags)
> +{
> + return ERR_PTR(-ENODEV);
> +}
> +#endif
... and of course I forgot to fix the main compilation error. Linus,
would you mind squashing what follows into this patch? Apologies for
the inconvenience.
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 05b9981..e1d1a15 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2172,8 +2172,8 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
return desc;
}
#else
-static struct device_node *of_find_gpio(struct device *dev, const char *id
- unsigned int idx, unsigned long flags)
+static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
+ unsigned int idx, unsigned long *flags)
{
return ERR_PTR(-ENODEV);
}
--
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