From: Felipe Balbi <balbi@ti.com>
To: lee.jones@linaro.org
Cc: Tony Lindgren <tony@atomide.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Felipe Balbi <balbi@ti.com>
Subject: [PATCH v3 08/15] mfd: menelaus: Pass menelaus_chip pointer to add/remove irq functions
Date: Mon, 9 Dec 2013 10:21:18 -0600 [thread overview]
Message-ID: <1386606085-26838-8-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1386606085-26838-1-git-send-email-balbi@ti.com>
Those functions are static and can receive a menelaus_chip pointer very
easily.
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/mfd/menelaus.c | 57 ++++++++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 27 deletions(-)
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 8796e5e..8672d86 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -236,28 +236,28 @@ static int menelaus_ack_irq(struct menelaus_chip *m, int irq)
}
/* Adds a handler for an interrupt. Does not run in interrupt context */
-static int menelaus_add_irq_work(int irq,
+static int menelaus_add_irq_work(struct menelaus_chip *m, int irq,
void (*handler)(struct menelaus_chip *))
{
int ret = 0;
- mutex_lock(&the_menelaus->lock);
- the_menelaus->handlers[irq] = handler;
- ret = menelaus_enable_irq(the_menelaus, irq);
- mutex_unlock(&the_menelaus->lock);
+ mutex_lock(&m->lock);
+ m->handlers[irq] = handler;
+ ret = menelaus_enable_irq(m, irq);
+ mutex_unlock(&m->lock);
return ret;
}
/* Removes handler for an interrupt */
-static int menelaus_remove_irq_work(int irq)
+static int menelaus_remove_irq_work(struct menelaus_chip *m, int irq)
{
int ret = 0;
- mutex_lock(&the_menelaus->lock);
- ret = menelaus_disable_irq(the_menelaus, irq);
- the_menelaus->handlers[irq] = NULL;
- mutex_unlock(&the_menelaus->lock);
+ mutex_lock(&m->lock);
+ ret = menelaus_disable_irq(m, irq);
+ m->handlers[irq] = NULL;
+ mutex_unlock(&m->lock);
return ret;
}
@@ -412,23 +412,24 @@ EXPORT_SYMBOL(menelaus_set_mmc_slot);
int menelaus_register_mmc_callback(void (*callback)(void *data, u8 card_mask),
void *data)
{
+ struct menelaus_chip *m = the_menelaus;
int ret = 0;
- the_menelaus->mmc_callback_data = data;
- the_menelaus->mmc_callback = callback;
- ret = menelaus_add_irq_work(MENELAUS_MMC_S1CD_IRQ,
+ m->mmc_callback_data = data;
+ m->mmc_callback = callback;
+ ret = menelaus_add_irq_work(m, MENELAUS_MMC_S1CD_IRQ,
menelaus_mmc_cd_work);
if (ret < 0)
return ret;
- ret = menelaus_add_irq_work(MENELAUS_MMC_S2CD_IRQ,
+ ret = menelaus_add_irq_work(m, MENELAUS_MMC_S2CD_IRQ,
menelaus_mmc_cd_work);
if (ret < 0)
return ret;
- ret = menelaus_add_irq_work(MENELAUS_MMC_S1D1_IRQ,
+ ret = menelaus_add_irq_work(m, MENELAUS_MMC_S1D1_IRQ,
menelaus_mmc_cd_work);
if (ret < 0)
return ret;
- ret = menelaus_add_irq_work(MENELAUS_MMC_S2D1_IRQ,
+ ret = menelaus_add_irq_work(m, MENELAUS_MMC_S2D1_IRQ,
menelaus_mmc_cd_work);
return ret;
@@ -437,13 +438,15 @@ EXPORT_SYMBOL(menelaus_register_mmc_callback);
void menelaus_unregister_mmc_callback(void)
{
- menelaus_remove_irq_work(MENELAUS_MMC_S1CD_IRQ);
- menelaus_remove_irq_work(MENELAUS_MMC_S2CD_IRQ);
- menelaus_remove_irq_work(MENELAUS_MMC_S1D1_IRQ);
- menelaus_remove_irq_work(MENELAUS_MMC_S2D1_IRQ);
+ struct menelaus_chip *m = the_menelaus;
+
+ menelaus_remove_irq_work(m, MENELAUS_MMC_S1CD_IRQ);
+ menelaus_remove_irq_work(m, MENELAUS_MMC_S2CD_IRQ);
+ menelaus_remove_irq_work(m, MENELAUS_MMC_S1D1_IRQ);
+ menelaus_remove_irq_work(m, MENELAUS_MMC_S2D1_IRQ);
- the_menelaus->mmc_callback = NULL;
- the_menelaus->mmc_callback_data = NULL;
+ m->mmc_callback = NULL;
+ m->mmc_callback_data = NULL;
}
EXPORT_SYMBOL(menelaus_unregister_mmc_callback);
@@ -1070,8 +1073,8 @@ static int menelaus_ioctl(struct device *dev, unsigned cmd, unsigned long arg)
case RTC_UIE_ON:
if (m->uie)
return 0;
- status = menelaus_remove_irq_work(MENELAUS_RTCTMR_IRQ);
- status = menelaus_add_irq_work(MENELAUS_RTCTMR_IRQ,
+ status = menelaus_remove_irq_work(m, MENELAUS_RTCTMR_IRQ);
+ status = menelaus_add_irq_work(m, MENELAUS_RTCTMR_IRQ,
menelaus_rtc_update_work);
if (status == 0)
m->uie = 1;
@@ -1079,7 +1082,7 @@ static int menelaus_ioctl(struct device *dev, unsigned cmd, unsigned long arg)
case RTC_UIE_OFF:
if (!m->uie)
return 0;
- status = menelaus_remove_irq_work(MENELAUS_RTCTMR_IRQ);
+ status = menelaus_remove_irq_work(m, MENELAUS_RTCTMR_IRQ);
if (status == 0)
m->uie = 0;
return status;
@@ -1127,7 +1130,7 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m)
/* support RTC alarm; it can issue wakeups */
if (alarm) {
- if (menelaus_add_irq_work(MENELAUS_RTCALM_IRQ,
+ if (menelaus_add_irq_work(m, MENELAUS_RTCALM_IRQ,
menelaus_rtc_alarm_work) < 0) {
dev_err(&m->client->dev, "can't handle RTC alarm\n");
return;
@@ -1154,7 +1157,7 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m)
&menelaus_rtc_ops, THIS_MODULE);
if (IS_ERR(m->rtc)) {
if (alarm) {
- menelaus_remove_irq_work(MENELAUS_RTCALM_IRQ);
+ menelaus_remove_irq_work(m, MENELAUS_RTCALM_IRQ);
device_init_wakeup(&m->client->dev, 0);
}
dev_err(&m->client->dev, "can't register RTC: %d\n",
--
1.8.4.GIT
next prev parent reply other threads:[~2013-12-09 16:21 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 3:42 [PATCH v2 01/15] mfd: menelaus: Drop __exit section annotation Felipe Balbi
2013-12-03 3:42 ` [PATCH v2 02/15] mfd: menelaus: Switch over to module_i2c_driver Felipe Balbi
2013-12-03 3:42 ` [PATCH v2 03/15] mfd: menelaus: Convert to threaded irq Felipe Balbi
2013-12-03 3:42 ` [PATCH v2 04/15] mfd: menelaus: Remove unnecessary loop Felipe Balbi
2013-12-03 3:42 ` [PATCH v2 05/15] mfd: menelaus: Use for_each_set_bit() Felipe Balbi
2013-12-03 3:42 ` [PATCH v2 06/15] mfd: menelaus: Pass menelaus pointer as argument to enable/disable irq Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 07/15] mfd: menelaus: Limit the usage of the_menelaus Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 08/15] mfd: menelaus: Pass menelaus_chip pointer to add/remove irq functions Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 09/15] mfd: menelaus: Pass menelaus_chip pointer to get/set voltage Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 10/15] mfd: menelaus: Pass menelaus_chip argument to menelaus <-> time helpers Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 11/15] mfd: menelaus: Start to use irqdomain Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 12/15] mfd: menelaus: Switch all children to threaded_irq Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 13/15] mfd: menelaus: Remove unnecessary definition Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 14/15] mfd: menelaus: IRQ is a requirement Felipe Balbi
2013-12-03 3:43 ` [PATCH v2 15/15] mfd: menelaus: Use devm_request_threaded_irq() Felipe Balbi
2013-12-03 9:51 ` [PATCH v2 01/15] mfd: menelaus: Drop __exit section annotation Lee Jones
2013-12-03 9:53 ` Lee Jones
2013-12-08 19:07 ` Felipe Balbi
2013-12-09 9:37 ` Lee Jones
2013-12-09 16:14 ` Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 " Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 02/15] mfd: menelaus: Switch over to module_i2c_driver Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 03/15] mfd: menelaus: Convert to threaded irq Felipe Balbi
2013-12-10 9:32 ` Lee Jones
2013-12-10 16:31 ` Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 04/15] mfd: menelaus: Remove unnecessary loop Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 05/15] mfd: menelaus: Use for_each_set_bit() Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 06/15] mfd: menelaus: Pass menelaus pointer as argument to enable/disable irq Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 07/15] mfd: menelaus: Limit the usage of the_menelaus Felipe Balbi
2013-12-10 8:57 ` Lee Jones
2013-12-10 16:32 ` Felipe Balbi
2013-12-11 9:17 ` Lee Jones
2013-12-09 16:21 ` Felipe Balbi [this message]
2013-12-10 9:00 ` [PATCH v3 08/15] mfd: menelaus: Pass menelaus_chip pointer to add/remove irq functions Lee Jones
2013-12-10 16:32 ` Felipe Balbi
2013-12-10 18:42 ` Lee Jones
2013-12-09 16:21 ` [PATCH v3 09/15] mfd: menelaus: Pass menelaus_chip pointer to get/set voltage Felipe Balbi
2013-12-10 9:01 ` Lee Jones
2013-12-09 16:21 ` [PATCH v3 10/15] mfd: menelaus: Pass menelaus_chip argument to menelaus <-> time helpers Felipe Balbi
2013-12-10 9:02 ` Lee Jones
2013-12-09 16:21 ` [PATCH v3 11/15] mfd: menelaus: Start to use irqdomain Felipe Balbi
2013-12-10 9:20 ` Lee Jones
2013-12-10 16:34 ` Felipe Balbi
2013-12-10 18:37 ` Lee Jones
2013-12-10 18:46 ` Tony Lindgren
2013-12-11 9:06 ` Lee Jones
2013-12-09 16:21 ` [PATCH v3 12/15] mfd: menelaus: Switch all children to threaded_irq Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 13/15] mfd: menelaus: Remove unnecessary definition Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 14/15] mfd: menelaus: IRQ is a requirement Felipe Balbi
2013-12-09 16:21 ` [PATCH v3 15/15] mfd: menelaus: Use devm_request_threaded_irq() Felipe Balbi
2013-12-10 9:30 ` Lee Jones
2013-12-10 16:34 ` Felipe Balbi
2013-12-10 18:32 ` Lee Jones
2013-12-11 9:48 ` [PATCH v3 01/15] mfd: menelaus: Drop __exit section annotation Uwe Kleine-König
2013-12-10 8:50 ` [PATCH v2 " Lee Jones
2013-12-10 16:36 ` Felipe Balbi
2013-12-06 13:41 ` Aaro Koskinen
2013-12-11 9:44 ` Uwe Kleine-König
2013-12-16 15:39 ` Lee Jones
2013-12-17 0:08 ` [PATCH 01/10] " Felipe Balbi
2013-12-17 0:08 ` [PATCH 02/10] mfd: menelaus: Switch over to module_i2c_driver Felipe Balbi
2013-12-17 0:08 ` [PATCH 03/10] mfd: menelaus: Convert to threaded irq Felipe Balbi
2013-12-17 0:08 ` [PATCH 04/10] mfd: menelaus: Remove unnecessary loop Felipe Balbi
2013-12-17 0:08 ` [PATCH 05/10] mfd: menelaus: Use for_each_set_bit() Felipe Balbi
2013-12-17 0:17 ` Joe Perches
2013-12-17 0:19 ` Felipe Balbi
2013-12-17 0:08 ` [PATCH 06/10] mfd: menelaus: Limit the usage of the_menelaus Felipe Balbi
2013-12-17 0:08 ` [PATCH 07/10] mfd: menelaus: Start to use irqdomain Felipe Balbi
2013-12-17 10:32 ` Lee Jones
2013-12-17 0:08 ` [PATCH 08/10] mfd: menelaus: Switch all children to threaded_irq Felipe Balbi
2013-12-17 10:35 ` Lee Jones
2013-12-17 0:08 ` [PATCH 09/10] mfd: menelaus: Remove unnecessary definition Felipe Balbi
2013-12-17 0:08 ` [PATCH 10/10] mfd: menelaus: IRQ is a requirement Felipe Balbi
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=1386606085-26838-8-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=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).