From: George Cherian <george.cherian@ti.com>
To: linus.walleij@linaro.org
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org, kuninori.morimoto.gx@renesas.com,
n.a.balandin@gmail.com, George Cherian <george.cherian@ti.com>
Subject: [PATCH v3 2/3] gpio: pcf857x: remove the irq_demux_work and gpio->irq
Date: Wed, 4 Sep 2013 12:33:02 +0530 [thread overview]
Message-ID: <1378278183-26596-3-git-send-email-george.cherian@ti.com> (raw)
In-Reply-To: <1378278183-26596-1-git-send-email-george.cherian@ti.com>
Now that we are using devm_request_threaded_irq no need for
irq_demux_work and gpio->irq. Remove all its references.
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/gpio/gpio-pcf857x.c | 37 -------------------------------------
1 file changed, 37 deletions(-)
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 4d0d28c..ef52ee3 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -30,7 +30,6 @@
#include <linux/of_device.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
-#include <linux/workqueue.h>
static const struct i2c_device_id pcf857x_id[] = {
@@ -89,12 +88,10 @@ struct pcf857x {
struct gpio_chip chip;
struct i2c_client *client;
struct mutex lock; /* protect 'out' */
- struct work_struct work; /* irq demux work */
struct irq_domain *irq_domain; /* for irq demux */
spinlock_t slock; /* protect irq demux */
unsigned out; /* software latch */
unsigned status; /* current status */
- int irq; /* real irq number */
int (*write)(struct i2c_client *client, unsigned data);
int (*read)(struct i2c_client *client);
@@ -210,38 +207,6 @@ static irqreturn_t pcf857x_irq(int irq, void *data)
return IRQ_HANDLED;
}
-static void pcf857x_irq_demux_work(struct work_struct *work)
-{
- struct pcf857x *gpio = container_of(work,
- struct pcf857x,
- work);
- unsigned long change, i, status, flags;
-
- status = gpio->read(gpio->client);
-
- spin_lock_irqsave(&gpio->slock, flags);
-
- change = gpio->status ^ status;
- for_each_set_bit(i, &change, gpio->chip.ngpio)
- generic_handle_irq(irq_find_mapping(gpio->irq_domain, i));
- gpio->status = status;
-
- spin_unlock_irqrestore(&gpio->slock, flags);
-}
-
-static irqreturn_t pcf857x_irq_demux(int irq, void *data)
-{
- struct pcf857x *gpio = data;
-
- /*
- * pcf857x can't read/write data here,
- * since i2c data access might go to sleep.
- */
- schedule_work(&gpio->work);
-
- return IRQ_HANDLED;
-}
-
static int pcf857x_irq_domain_map(struct irq_domain *domain, unsigned int virq,
irq_hw_number_t hw)
{
@@ -284,9 +249,7 @@ static int pcf857x_irq_domain_init(struct pcf857x *gpio,
goto fail;
/* enable gpio_to_irq() */
- INIT_WORK(&gpio->work, pcf857x_irq_demux_work);
gpio->chip.to_irq = pcf857x_to_irq;
- gpio->irq = client->irq;
return 0;
--
1.8.1.4
next prev parent reply other threads:[~2013-09-04 7:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 7:03 [PATCH v4 0/3] cleanup of gpio_pcf857x.c George Cherian
2013-09-04 7:03 ` [PATCH v3 1/3] gpio: pcf857x: change to devm_request_threaded_irq George Cherian
2013-09-04 7:03 ` George Cherian [this message]
2013-09-04 7:03 ` [PATCH v3 3/3] gpio: pcf857x: call the gpio user handler iff gpio_to_irq is done George Cherian
2013-09-06 1:17 ` [PATCH v4 0/3] cleanup of gpio_pcf857x.c Kuninori Morimoto
2013-09-17 12:51 ` Linus Walleij
2013-09-17 22:56 ` Laurent Pinchart
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=1378278183-26596-3-git-send-email-george.cherian@ti.com \
--to=george.cherian@ti.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=n.a.balandin@gmail.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).