From: Felipe Balbi <balbi@ti.com>
To: <sameo@linux.intel.com>
Cc: <lee.jones@linaro.org>, Tony Lindgren <tony@atomide.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
Felipe Balbi <balbi@ti.com>
Subject: [PATCH 03/13] mfd: menelaus: convert to threaded irq
Date: Wed, 27 Nov 2013 13:06:47 -0600 [thread overview]
Message-ID: <1385579217-20127-4-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1385579217-20127-1-git-send-email-balbi@ti.com>
we don't need that extra workqueue when we
have generic threaded irq handlers support.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/mfd/menelaus.c | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 8bd97ca..11d7d81 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -36,7 +36,6 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/mutex.h>
-#include <linux/workqueue.h>
#include <linux/delay.h>
#include <linux/rtc.h>
#include <linux/bcd.h>
@@ -161,12 +160,9 @@
#define MCT_PIN_ST_S1_CD_ST (1 << 0)
#define MCT_PIN_ST_S2_CD_ST (1 << 1)
-static void menelaus_work(struct work_struct *_menelaus);
-
struct menelaus_chip {
struct mutex lock;
struct i2c_client *client;
- struct work_struct work;
#ifdef CONFIG_RTC_DRV_TWL92330
struct rtc_device *rtc;
u8 rtc_control;
@@ -795,11 +791,9 @@ out:
/*-----------------------------------------------------------------------*/
-/* Handles Menelaus interrupts. Does not run in interrupt context */
-static void menelaus_work(struct work_struct *_menelaus)
+static irqreturn_t menelaus_irq(int irq, void *_menelaus)
{
- struct menelaus_chip *menelaus =
- container_of(_menelaus, struct menelaus_chip, work);
+ struct menelaus_chip *menelaus = _menelaus;
void (*handler)(struct menelaus_chip *menelaus);
while (1) {
@@ -826,18 +820,6 @@ static void menelaus_work(struct work_struct *_menelaus)
mutex_unlock(&menelaus->lock);
}
}
- enable_irq(menelaus->client->irq);
-}
-
-/*
- * We cannot use I2C in interrupt context, so we just schedule work.
- */
-static irqreturn_t menelaus_irq(int irq, void *_menelaus)
-{
- struct menelaus_chip *menelaus = _menelaus;
-
- disable_irq_nosync(irq);
- (void)schedule_work(&menelaus->work);
return IRQ_HANDLED;
}
@@ -1225,8 +1207,8 @@ static int menelaus_probe(struct i2c_client *client,
menelaus_write_reg(MENELAUS_MCT_CTRL1, 0x73);
if (client->irq > 0) {
- err = request_irq(client->irq, menelaus_irq, 0,
- DRIVER_NAME, menelaus);
+ err = request_threaded_irq(client->irq, NULL, menelaus_irq,
+ IRQF_ONESHOT, DRIVER_NAME, menelaus);
if (err) {
dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
client->irq, err);
@@ -1235,7 +1217,6 @@ static int menelaus_probe(struct i2c_client *client,
}
mutex_init(&menelaus->lock);
- INIT_WORK(&menelaus->work, menelaus_work);
pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
@@ -1258,7 +1239,6 @@ static int menelaus_probe(struct i2c_client *client,
return 0;
fail:
free_irq(client->irq, menelaus);
- flush_work(&menelaus->work);
return err;
}
@@ -1267,7 +1247,6 @@ static int menelaus_remove(struct i2c_client *client)
struct menelaus_chip *menelaus = i2c_get_clientdata(client);
free_irq(client->irq, menelaus);
- flush_work(&menelaus->work);
the_menelaus = NULL;
return 0;
}
--
1.8.4.GIT
next prev parent reply other threads:[~2013-11-27 19:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 19:06 [PATCH 00/13] mfd: menelaus: a few cleanups Felipe Balbi
2013-11-27 19:06 ` [PATCH 01/13] mfd: menelaus: drop __exit section annotation Felipe Balbi
2013-11-27 19:06 ` [PATCH 02/13] mfd: menelaus: switch over to module_i2c_driver Felipe Balbi
2013-11-27 19:06 ` Felipe Balbi [this message]
2013-11-27 19:06 ` [PATCH 04/13] mfd: menelaus: remove unnecessary loop Felipe Balbi
2013-11-27 19:06 ` [PATCH 05/13] mfd: menelaus: use for_each_set_bit() Felipe Balbi
2013-11-27 19:06 ` [PATCH 06/13] mfd: menelaus: pass menelaus pointer as argument to enable/disable irq Felipe Balbi
2013-11-27 19:06 ` [PATCH 07/13] mfd: menelaus: limit the usage of the_menelaus Felipe Balbi
2013-11-27 19:06 ` [PATCH 08/13] mfd: menelaus: pass menelaus_chip pointer to add/remove irq functions Felipe Balbi
2013-11-27 19:06 ` [PATCH 09/13] mfd: menelaus: pass menelaus_chip pointer to get/set voltage Felipe Balbi
2013-11-27 19:06 ` [PATCH 10/13] mfd: menelaus: pass menelaus_chip argument to menelaus <-> time helpers Felipe Balbi
2013-11-27 19:06 ` [PATCH 11/13] mfd: menelaus: start to use irqdomain Felipe Balbi
2013-11-27 19:06 ` [PATCH 12/13] mfd: menelaus: switch all children to threaded_irq Felipe Balbi
2013-11-27 19:06 ` [PATCH 13/13] mfd: menelaus: remove unnecessary definition Felipe Balbi
2013-11-27 20:02 ` [PATCH 00/13] mfd: menelaus: a few cleanups Aaro Koskinen
2013-11-27 20:11 ` Felipe Balbi
2013-11-27 20:46 ` Aaro Koskinen
2013-11-28 3:00 ` Felipe Balbi
2013-11-28 9:32 ` Lee Jones
2013-11-28 21:34 ` Aaro Koskinen
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=1385579217-20127-4-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=aaro.koskinen@iki.fi \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.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).