[PATCH v3 14/15] mfd: menelaus: IRQ is a requirement

From: Felipe Balbi
Date: Mon Dec 09 2013 - 11:27:30 EST


This driver needs IRQ to work, if client->irq isn't set properly, we
won't work. Remove check around request_threaded_irq().

Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/