From patchwork Wed Nov 27 19:06:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 3249601 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 03CF8C045B for ; Wed, 27 Nov 2013 19:39:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD235205EF for ; Wed, 27 Nov 2013 19:39:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4E93205EE for ; Wed, 27 Nov 2013 19:39:36 +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 1VlkWG-0006Rj-Lx; Wed, 27 Nov 2013 19:11:29 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VlkVd-0007d0-7a; Wed, 27 Nov 2013 19:10:49 +0000 Received: from comal.ext.ti.com ([198.47.26.152]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VlkTG-0007Kx-Pr for linux-arm-kernel@lists.infradead.org; Wed, 27 Nov 2013 19:08:36 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id rARJ7roF005431; Wed, 27 Nov 2013 13:07:53 -0600 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id rARJ7rFx031465; Wed, 27 Nov 2013 13:07:53 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Wed, 27 Nov 2013 13:07:52 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id rARJ7pRw022986; Wed, 27 Nov 2013 13:07:52 -0600 From: Felipe Balbi To: Subject: [PATCH 12/13] mfd: menelaus: switch all children to threaded_irq Date: Wed, 27 Nov 2013 13:06:56 -0600 Message-ID: <1385579217-20127-13-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.8.4.GIT In-Reply-To: <1385579217-20127-1-git-send-email-balbi@ti.com> References: <1385579217-20127-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-20131127_140823_044235_ECE2BD40 X-CRM114-Status: GOOD ( 19.16 ) X-Spam-Score: -6.9 (------) Cc: Aaro Koskinen , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Linux OMAP Mailing List , 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 now that we have our own irq_chip, all children can use traditional request_threaded_irq(). While at that, also remove so functions which became unused. Signed-off-by: Felipe Balbi --- drivers/mfd/menelaus.c | 161 +++++++++++++++---------------------------------- 1 file changed, 50 insertions(+), 111 deletions(-) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 295fe84..e7006e4 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -175,7 +175,6 @@ struct menelaus_chip { u8 mask1, mask2; u8 ack1, ack2; - void (*handlers[16])(struct menelaus_chip *); void (*mmc_callback)(void *data, u8 mask); void *mmc_callback_data; @@ -209,42 +208,6 @@ static int menelaus_read_reg(struct menelaus_chip *m, int reg) return val; } -static int menelaus_enable_irq(struct menelaus_chip *m, int irq) -{ - if (irq > 7) { - irq -= 8; - m->mask2 &= ~(1 << irq); - return menelaus_write_reg(m, MENELAUS_INT_MASK2, - m->mask2); - } else { - m->mask1 &= ~(1 << irq); - return menelaus_write_reg(m, MENELAUS_INT_MASK1, - m->mask1); - } -} - -static int menelaus_disable_irq(struct menelaus_chip *m, int irq) -{ - if (irq > 7) { - irq -= 8; - m->mask2 |= (1 << irq); - return menelaus_write_reg(m, MENELAUS_INT_MASK2, - m->mask2); - } else { - m->mask1 |= (1 << irq); - return menelaus_write_reg(m, MENELAUS_INT_MASK1, - m->mask1); - } -} - -static int menelaus_ack_irq(struct menelaus_chip *m, int irq) -{ - if (irq > 7) - return menelaus_write_reg(m, MENELAUS_INT_ACK2, 1 << (irq - 8)); - else - return menelaus_write_reg(m, MENELAUS_INT_ACK1, 1 << irq); -} - static void menelaus_irq_ack(struct irq_data *data) { struct menelaus_chip *m = irq_data_get_irq_chip_data(data); @@ -322,47 +285,15 @@ static struct irq_chip menelaus_irq_chip = { .irq_bus_sync_unlock = menelaus_irq_bus_sync_unlock, }; -/* Adds a handler for an interrupt. Does not run in interrupt context */ -static int menelaus_add_irq_work(struct menelaus_chip *m, int irq, - void (*handler)(struct menelaus_chip *)) -{ - int ret = 0; - - 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(struct menelaus_chip *m, int irq) -{ - int ret = 0; - - mutex_lock(&m->lock); - ret = menelaus_disable_irq(m, irq); - m->handlers[irq] = NULL; - mutex_unlock(&m->lock); - - return ret; -} - -/* - * Gets scheduled when a card detect interrupt happens. Note that in some cases - * this line is wired to card cover switch rather than the card detect switch - * in each slot. In this case the cards are not seen by menelaus. - * FIXME: Add handling for D1 too - */ -static void menelaus_mmc_cd_work(struct menelaus_chip *m) +static irqreturn_t menelaus_mmc_cd_irq(int irq, void *_m) { - int reg; + struct menelaus_chip *m = _m; unsigned char card_mask = 0; + int reg; reg = menelaus_read_reg(m, MENELAUS_MCT_PIN_ST); if (reg < 0) - return; + return IRQ_NONE; if (!(reg & 0x1)) card_mask |= MCT_PIN_ST_S1_CD_ST; @@ -373,6 +304,8 @@ static void menelaus_mmc_cd_work(struct menelaus_chip *m) if (m->mmc_callback) m->mmc_callback(m->mmc_callback_data, card_mask); + + return IRQ_HANDLED; } /* @@ -504,20 +437,25 @@ int menelaus_register_mmc_callback(void (*callback)(void *data, u8 card_mask), m->mmc_callback_data = data; m->mmc_callback = callback; - ret = menelaus_add_irq_work(m, MENELAUS_MMC_S1CD_IRQ, - menelaus_mmc_cd_work); + + ret = request_threaded_irq(MENELAUS_MMC_S1CD_IRQ + m->irq_base, + NULL, menelaus_mmc_cd_irq, IRQF_ONESHOT, + "mmc_s1cd", m); if (ret < 0) return ret; - ret = menelaus_add_irq_work(m, MENELAUS_MMC_S2CD_IRQ, - menelaus_mmc_cd_work); + ret = request_threaded_irq(MENELAUS_MMC_S2CD_IRQ + m->irq_base, + NULL, menelaus_mmc_cd_irq, IRQF_ONESHOT, + "mmc_s2cd", m); if (ret < 0) return ret; - ret = menelaus_add_irq_work(m, MENELAUS_MMC_S1D1_IRQ, - menelaus_mmc_cd_work); + ret = request_threaded_irq(MENELAUS_MMC_S1D1_IRQ + m->irq_base, + NULL, menelaus_mmc_cd_irq, IRQF_ONESHOT, + "mmc_s1d1", m); if (ret < 0) return ret; - ret = menelaus_add_irq_work(m, MENELAUS_MMC_S2D1_IRQ, - menelaus_mmc_cd_work); + ret = request_threaded_irq(MENELAUS_MMC_S2D1_IRQ + m->irq_base, + NULL, menelaus_mmc_cd_irq, IRQF_ONESHOT, + "mmc_s2d1", m); return ret; } @@ -527,10 +465,10 @@ void menelaus_unregister_mmc_callback(void) { 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); + free_irq(MENELAUS_MMC_S1CD_IRQ + m->irq_base, m); + free_irq(MENELAUS_MMC_S2CD_IRQ + m->irq_base, m); + free_irq(MENELAUS_MMC_S1D1_IRQ + m->irq_base, m); + free_irq(MENELAUS_MMC_S2D1_IRQ + m->irq_base, m); m->mmc_callback = NULL; m->mmc_callback_data = NULL; @@ -899,7 +837,6 @@ out: static irqreturn_t menelaus_irq(int irq, void *_menelaus) { struct menelaus_chip *m = _menelaus; - void (*handler)(struct menelaus_chip *m); unsigned long isr; unsigned long i; @@ -909,14 +846,9 @@ static irqreturn_t menelaus_irq(int irq, void *_menelaus) & ~m->mask1; for_each_set_bit(i, &isr, 16) { - mutex_lock(&m->lock); - menelaus_disable_irq(m, i); - menelaus_ack_irq(m, i); - handler = m->handlers[i]; - if (handler) - handler(m); - menelaus_enable_irq(m, i); - mutex_unlock(&m->lock); + int irq = i + m->irq_base; + + handle_nested_irq(irq); } return IRQ_HANDLED; @@ -1131,18 +1063,19 @@ static int menelaus_set_alarm(struct device *dev, struct rtc_wkalrm *w) #ifdef CONFIG_RTC_INTF_DEV -static void menelaus_rtc_update_work(struct menelaus_chip *m) +static irqreturn_t menelaus_rtc_update_irq(int irq, void *_m) { - /* report 1/sec update */ - local_irq_disable(); + struct menelaus_chip *m = _m; + rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_UF); - local_irq_enable(); + + return IRQ_HANDLED; } static int menelaus_ioctl(struct device *dev, unsigned cmd, unsigned long arg) { struct menelaus_chip *m = dev_get_drvdata(dev); - int status; + int status = 0; if (m->client->irq <= 0) return -ENOIOCTLCMD; @@ -1163,18 +1096,18 @@ 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(m, MENELAUS_RTCTMR_IRQ); - status = menelaus_add_irq_work(m, MENELAUS_RTCTMR_IRQ, - menelaus_rtc_update_work); + free_irq(MENELAUS_RTCTMR_IRQ + m->irq_base, m); + status = request_threaded_irq(MENELAUS_RTCTMR_IRQ + m->irq_base, + NULL, menelaus_rtc_update_irq, IRQF_ONESHOT, + "rtc-timer", m); if (status == 0) m->uie = 1; return status; case RTC_UIE_OFF: if (!m->uie) return 0; - status = menelaus_remove_irq_work(m, MENELAUS_RTCTMR_IRQ); - if (status == 0) - m->uie = 0; + free_irq(MENELAUS_RTCTMR_IRQ + m->irq_base, m); + m->uie = 0; return status; default: return -ENOIOCTLCMD; @@ -1196,16 +1129,18 @@ static const struct rtc_class_ops menelaus_rtc_ops = { .set_alarm = menelaus_set_alarm, }; -static void menelaus_rtc_alarm_work(struct menelaus_chip *m) +static irqreturn_t menelaus_rtc_alarm_irq(int irq, void *_m) { + struct menelaus_chip *m = _m; + /* report alarm */ - local_irq_disable(); rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_AF); - local_irq_enable(); /* then disable it; alarms are oneshot */ m->rtc_control &= ~RTC_CTRL_AL_EN; menelaus_write_reg(m, MENELAUS_RTC_CTRL, m->rtc_control); + + return IRQ_HANDLED; } static inline void menelaus_rtc_init(struct menelaus_chip *m) @@ -1220,8 +1155,12 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m) /* support RTC alarm; it can issue wakeups */ if (alarm) { - if (menelaus_add_irq_work(m, MENELAUS_RTCALM_IRQ, - menelaus_rtc_alarm_work) < 0) { + int ret; + + ret = request_threaded_irq(MENELAUS_RTCALM_IRQ + m->irq_base, + NULL, menelaus_rtc_alarm_irq, IRQF_ONESHOT, + "rtc-alarm", m); + if (ret < 0) { dev_err(&m->client->dev, "can't handle RTC alarm\n"); return; } @@ -1247,7 +1186,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(m, MENELAUS_RTCALM_IRQ); + free_irq(MENELAUS_RTCALM_IRQ + m->irq_base, m); device_init_wakeup(&m->client->dev, 0); } dev_err(&m->client->dev, "can't register RTC: %d\n",