From patchwork Tue Dec 3 03:43:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 3273541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B9183C0D4A for ; Tue, 3 Dec 2013 03:48:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDCE42020F for ; Tue, 3 Dec 2013 03:48:30 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 938772015D for ; Tue, 3 Dec 2013 03:48:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vngvr-0007RU-J7; Tue, 03 Dec 2013 03:45:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VngvM-0000E3-Mk; Tue, 03 Dec 2013 03:45:24 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VnguS-0008Uw-HS for linux-arm-kernel@lists.infradead.org; Tue, 03 Dec 2013 03:44:36 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id rB33hvLs009609; Mon, 2 Dec 2013 21:43:57 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id rB33hvcE019264; Mon, 2 Dec 2013 21:43:57 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Mon, 2 Dec 2013 21:43:57 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id rB33hupk004985; Mon, 2 Dec 2013 21:43:56 -0600 From: Felipe Balbi To: Linux OMAP Mailing List Subject: [PATCH v2 08/15] mfd: menelaus: Pass menelaus_chip pointer to add/remove irq functions Date: Mon, 2 Dec 2013 21:43:01 -0600 Message-ID: <1386042188-12246-8-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.8.4.GIT In-Reply-To: <1386042188-12246-1-git-send-email-balbi@ti.com> References: <1386042188-12246-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131202_224428_818263_D60E77DA X-CRM114-Status: GOOD ( 14.43 ) X-Spam-Score: -6.9 (------) Cc: sameo@linux.intel.com, Aaro Koskinen , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , lee.jones@linaro.org, Linux ARM Kernel Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP those functions are static and can receive a menelaus_chip pointer very easily. Signed-off-by: Felipe Balbi --- 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",