From: George Cherian <george.cherian@ti.com>
To: <cw00.choi@samsung.com>, <robh+dt@kernel.org>,
<pawel.moll@arm.com>, <mark.rutland@arm.com>,
<ijc+devicetree@hellion.org.uk>, <galak@codeaurora.org>,
<myungjoo.ham@samsung.com>, <grant.likely@linaro.org>,
<rongjun.ying@csr.com>, <linux@roeck-us.net>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
George Cherian <george.cherian@ti.com>
Subject: [PATCH 2/5] extcon: gpio: Convert the driver to use gpio desc API's
Date: Tue, 9 Sep 2014 09:44:35 +0530 [thread overview]
Message-ID: <1410236078-11713-3-git-send-email-george.cherian@ti.com> (raw)
In-Reply-To: <1410236078-11713-1-git-send-email-george.cherian@ti.com>
Convert the driver to use gpiod_* API's.
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/extcon/extcon-gpio.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 72f19a3..25269f6 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -33,8 +33,7 @@
struct gpio_extcon_data {
struct extcon_dev *edev;
- unsigned gpio;
- bool gpio_active_low;
+ struct gpio_desc *gpiod;
const char *state_on;
const char *state_off;
int irq;
@@ -50,9 +49,7 @@ static void gpio_extcon_work(struct work_struct *work)
container_of(to_delayed_work(work), struct gpio_extcon_data,
work);
- state = gpio_get_value(data->gpio);
- if (data->gpio_active_low)
- state = !state;
+ state = gpiod_get_value(data->gpiod);
extcon_set_state(data->edev, state);
}
@@ -106,22 +103,21 @@ static int gpio_extcon_probe(struct platform_device *pdev)
}
extcon_data->edev->name = pdata->name;
- extcon_data->gpio = pdata->gpio;
- extcon_data->gpio_active_low = pdata->gpio_active_low;
+ extcon_data->gpiod = gpio_to_desc(pdata->gpio);
extcon_data->state_on = pdata->state_on;
extcon_data->state_off = pdata->state_off;
extcon_data->check_on_resume = pdata->check_on_resume;
if (pdata->state_on && pdata->state_off)
extcon_data->edev->print_state = extcon_gpio_print_state;
- ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
+ ret = devm_gpio_request_one(&pdev->dev, pdata->gpio, GPIOF_DIR_IN,
pdev->name);
if (ret < 0)
return ret;
if (pdata->debounce) {
- ret = gpio_set_debounce(extcon_data->gpio,
- pdata->debounce * 1000);
+ ret = gpiod_set_debounce(extcon_data->gpiod,
+ pdata->debounce * 1000);
if (ret < 0)
extcon_data->debounce_jiffies =
msecs_to_jiffies(pdata->debounce);
@@ -133,7 +129,7 @@ static int gpio_extcon_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&extcon_data->work, gpio_extcon_work);
- extcon_data->irq = gpio_to_irq(extcon_data->gpio);
+ extcon_data->irq = gpiod_to_irq(extcon_data->gpiod);
if (extcon_data->irq < 0)
return extcon_data->irq;
--
1.8.3.1
next prev parent reply other threads:[~2014-09-09 4:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-09 4:14 [PATCH 0/5] Add dt support for extcon gpio driver George Cherian
2014-09-09 4:14 ` [PATCH 1/5] extcon: gpio: Minor cleanups George Cherian
2014-09-22 7:54 ` Chanwoo Choi
2014-09-09 4:14 ` George Cherian [this message]
2014-09-22 8:07 ` [PATCH 2/5] extcon: gpio: Convert the driver to use gpio desc API's Chanwoo Choi
2014-09-22 9:51 ` George Cherian
2014-09-22 23:14 ` Chanwoo Choi
2014-09-23 5:14 ` George Cherian
2014-09-09 4:14 ` [PATCH 3/5] extcon: gpio: Add dt support for the driver George Cherian
2014-09-09 4:14 ` [PATCH 4/5] extcon: gpio: Always use gpio_get_value_cansleep George Cherian
2014-09-09 4:14 ` [PATCH 5/5] extcon: gpio: Add support for using cable names George Cherian
2014-09-16 6:41 ` [PATCH 0/5] Add dt support for extcon gpio driver George Cherian
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=1410236078-11713-3-git-send-email-george.cherian@ti.com \
--to=george.cherian@ti.com \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=myungjoo.ham@samsung.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=rongjun.ying@csr.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).