Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbcDUMiM (ORCPT ); Thu, 21 Apr 2016 08:38:12 -0400 Received: from hqemgate14.nvidia.com ([216.228.121.143]:7490 "EHLO hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbcDUMiG (ORCPT ); Thu, 21 Apr 2016 08:38:06 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Thu, 21 Apr 2016 05:37:56 -0700 From: Laxman Dewangan To: , , , CC: , , , , , Laxman Dewangan Subject: [PATCH 2/7] mfd: lp8788: Use devm_mfd_add_devices and devm_regmap_add_irq_chip Date: Thu, 21 Apr 2016 17:55:53 +0530 Message-ID: <1461241558-26983-3-git-send-email-ldewangan@nvidia.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1461241558-26983-1-git-send-email-ldewangan@nvidia.com> References: <1461241558-26983-1-git-send-email-ldewangan@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2013 Lines: 70 Use devm_mfd_add_devices() for adding MFD child devices and devm_regmap_add_irq_chip() for IRQ chip registration. This reduces the error code path and .remove callback for removing MFD child devices and deleting IRQ chip data. Signed-off-by: Laxman Dewangan CC: Milo Kim --- drivers/mfd/lp8788-irq.c | 12 +++--------- drivers/mfd/lp8788.c | 10 ---------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/mfd/lp8788-irq.c b/drivers/mfd/lp8788-irq.c index 792d51b..aacd39f 100644 --- a/drivers/mfd/lp8788-irq.c +++ b/drivers/mfd/lp8788-irq.c @@ -175,9 +175,9 @@ int lp8788_irq_init(struct lp8788 *lp, int irq) lp->irqdm = irqd->domain; mutex_init(&irqd->irq_lock); - ret = request_threaded_irq(irq, NULL, lp8788_irq_handler, - IRQF_TRIGGER_FALLING | IRQF_ONESHOT, - "lp8788-irq", irqd); + ret = devm_request_threaded_irq(lp->dev, irq, NULL, lp8788_irq_handler, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + "lp8788-irq", irqd); if (ret) { dev_err(lp->dev, "failed to create a thread for IRQ_N\n"); return ret; @@ -187,9 +187,3 @@ int lp8788_irq_init(struct lp8788 *lp, int irq) return 0; } - -void lp8788_irq_exit(struct lp8788 *lp) -{ - if (lp->irq) - free_irq(lp->irq, lp->irqdm); -} diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c index acf6165..37fea46 100644 --- a/drivers/mfd/lp8788.c +++ b/drivers/mfd/lp8788.c @@ -203,15 +203,6 @@ static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id) ARRAY_SIZE(lp8788_devs), NULL, 0, NULL); } -static int lp8788_remove(struct i2c_client *cl) -{ - struct lp8788 *lp = i2c_get_clientdata(cl); - - mfd_remove_devices(lp->dev); - lp8788_irq_exit(lp); - return 0; -} - static const struct i2c_device_id lp8788_ids[] = { {"lp8788", 0}, { } @@ -223,7 +214,6 @@ static struct i2c_driver lp8788_driver = { .name = "lp8788", }, .probe = lp8788_probe, - .remove = lp8788_remove, .id_table = lp8788_ids, }; -- 2.1.4