From: Alex Courbot <acourbot@nvidia.com>
To: Alexandre Courbot <acourbot@nvidia.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Grant Likely <grant.likely@linaro.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"gnurou@gmail.com" <gnurou@gmail.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Mathias Nyman <mathias.nyman@linux.intel.com>,
"linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [PATCH v2 3/3] gpiolib: add gpiod_get() and gpiod_put() functions
Date: Fri, 11 Oct 2013 15:31:19 -0700 [thread overview]
Message-ID: <52587C37.3070606@nvidia.com> (raw)
In-Reply-To: <1381515273-25466-4-git-send-email-acourbot@nvidia.com>
> +#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);
}
next prev parent reply other threads:[~2013-10-11 22:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-11 18:14 [PATCH v2 0/3] New descriptor-based GPIO interface Alexandre Courbot
2013-10-11 18:14 ` [PATCH v2 1/3] gpiolib: export " Alexandre Courbot
2013-10-16 8:11 ` Linus Walleij
2013-10-16 8:25 ` Linus Walleij
2013-10-11 18:14 ` [PATCH v2 2/3] gpiolib: port of_ functions to use gpiod Alexandre Courbot
2013-10-11 18:14 ` [PATCH v2 3/3] gpiolib: add gpiod_get() and gpiod_put() functions Alexandre Courbot
2013-10-11 22:31 ` Alex Courbot [this message]
2013-10-16 11:37 ` Linus Walleij
2013-10-16 16:10 ` Alex Courbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52587C37.3070606@nvidia.com \
--to=acourbot@nvidia.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=gnurou@gmail.com \
--cc=grant.likely@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).