From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751381AbdILJDm (ORCPT ); Tue, 12 Sep 2017 05:03:42 -0400 Received: from botnar.kaiser.cx ([176.28.20.183]:35406 "EHLO botnar.kaiser.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbdILJDl (ORCPT ); Tue, 12 Sep 2017 05:03:41 -0400 X-Greylist: delayed 1644 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Sep 2017 05:03:40 EDT From: Martin Kaiser To: Lee Jones , kernel@pengutronix.de Cc: linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/2] mfd: fsl-imx25: clean up irq settings during removal Date: Tue, 12 Sep 2017 10:34:16 +0200 Message-Id: <1505205256-6828-2-git-send-email-martin@kaiser.cx> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1505205256-6828-1-git-send-email-martin@kaiser.cx> References: <1505205256-6828-1-git-send-email-martin@kaiser.cx> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When fsl-imx25-tsadc is compiled as a module, unloading and reloading the module will lead to a crash. Add a removal function which clears the irq handler and removes the irq domain. With this cleanup in place, it's possible to unload and reload the module. Signed-off-by: Martin Kaiser --- drivers/mfd/fsl-imx25-tsadc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c index 14189ef..a6423bd 100644 --- a/drivers/mfd/fsl-imx25-tsadc.c +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -179,6 +179,19 @@ static int mx25_tsadc_probe(struct platform_device *pdev) return devm_of_platform_populate(dev); } +static int __exit mx25_tsadc_remove(struct platform_device *pdev) +{ + struct mx25_tsadc *tsadc = platform_get_drvdata(pdev); + int irq = platform_get_irq(pdev, 0); + + if (irq) { + irq_set_chained_handler_and_data(irq, NULL, NULL); + irq_domain_remove(tsadc->domain); + } + + return 0; +} + static const struct of_device_id mx25_tsadc_ids[] = { { .compatible = "fsl,imx25-tsadc" }, { /* Sentinel */ } @@ -191,6 +204,7 @@ static struct platform_driver mx25_tsadc_driver = { .of_match_table = of_match_ptr(mx25_tsadc_ids), }, .probe = mx25_tsadc_probe, + .remove = __exit_p(mx25_tsadc_remove), }; module_platform_driver(mx25_tsadc_driver); -- 2.1.4