From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: [PATCH v2 14/15] mfd: menelaus: IRQ is a requirement Date: Mon, 2 Dec 2013 21:43:07 -0600 Message-ID: <1386042188-12246-14-git-send-email-balbi@ti.com> References: <1386042188-12246-1-git-send-email-balbi@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from comal.ext.ti.com ([198.47.26.152]:45173 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753750Ab3LCDop (ORCPT ); Mon, 2 Dec 2013 22:44:45 -0500 In-Reply-To: <1386042188-12246-1-git-send-email-balbi@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Linux OMAP Mailing List Cc: Aaro Koskinen , sameo@linux.intel.com, Tony Lindgren , lee.jones@linaro.org, Linux ARM Kernel Mailing List , Linux Kernel Mailing List , Felipe Balbi this driver needs IRQ to work, if client->irq isn't set properly, we won't work. Remove check around request_threaded_irq(). Signed-off-by: Felipe Balbi --- drivers/mfd/menelaus.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index c0219b7..bffe978 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1271,14 +1271,12 @@ static int menelaus_probe(struct i2c_client *client, /* Set output buffer strengths */ menelaus_write_reg(m, MENELAUS_MCT_CTRL1, 0x73); - if (client->irq > 0) { - err = request_threaded_irq(client->irq, NULL, menelaus_irq, - IRQF_ONESHOT, DRIVER_NAME, m); - if (err) { - dev_dbg(&client->dev, "can't get IRQ %d, err %d\n", - client->irq, err); - goto fail_free_descs; - } + err = request_threaded_irq(client->irq, NULL, menelaus_irq, + IRQF_ONESHOT, DRIVER_NAME, m); + if (err) { + dev_dbg(&client->dev, "can't get IRQ %d, err %d\n", + client->irq, err); + goto fail_free_descs; } pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f); -- 1.8.4.GIT