From nobody Fri Apr 3 02:26:15 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2966C32771 for ; Sun, 18 Sep 2022 10:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229852AbiIRKAC (ORCPT ); Sun, 18 Sep 2022 06:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230211AbiIRJ7X (ORCPT ); Sun, 18 Sep 2022 05:59:23 -0400 Received: from hutie.ust.cz (hutie.ust.cz [185.8.165.127]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 193EFFFD; Sun, 18 Sep 2022 02:59:19 -0700 (PDT) From: =?UTF-8?q?Martin=20Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1663495157; bh=gaKj0Ci5FD63deotj130sKbZ5bE1yUtuVtF+Ah5tT40=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IDTxXvLfZNDc4JOl0JP8m6l4wQRFooeggzLjK21+aezGO81b0Fdv+LjxPvbhUncL3 DpJuT/7miSTKMNJvw4594YyjbRWpDVGJLW8BeZq0JP2VTtbGz7BWOaIW4f4HpFpTs8 l28P27O2tz/HQNoFKme3dvax7zeTQWWDkxIpvNm8= To: Hector Martin , Sven Peter , Vinod Koul , Rob Herring , Krzysztof Kozlowski , Philipp Zabel Cc: Alyssa Rosenzweig , asahi@lists.linux.dev, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Martin=20Povi=C5=A1er?= Subject: [PATCH 3/4] dmaengine: apple-admac: Do not use devres for IRQs Date: Sun, 18 Sep 2022 11:58:44 +0200 Message-Id: <20220918095845.68860-4-povik+lin@cutebit.org> In-Reply-To: <20220918095845.68860-1-povik+lin@cutebit.org> References: <20220918095845.68860-1-povik+lin@cutebit.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is in advance of adding support for triggering the reset signal to the peripheral, since registering the IRQ handler will have to be sequenced with it. Signed-off-by: Martin Povi=C5=A1er --- drivers/dma/apple-admac.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index d1f74a3aa999..7d1b76678032 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -96,6 +96,7 @@ struct admac_data { struct device *dev; __iomem void *base; =20 + int irq; int irq_index; int nchannels; struct admac_chan channels[]; @@ -724,12 +725,7 @@ static int admac_probe(struct platform_device *pdev) =20 if (irq < 0) return dev_err_probe(&pdev->dev, irq, "no usable interrupt\n"); - - err =3D devm_request_irq(&pdev->dev, irq, admac_interrupt, - 0, dev_name(&pdev->dev), ad); - if (err) - return dev_err_probe(&pdev->dev, err, - "unable to register interrupt\n"); + ad->irq =3D irq; =20 ad->base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(ad->base)) @@ -774,17 +770,29 @@ static int admac_probe(struct platform_device *pdev) tasklet_setup(&adchan->tasklet, admac_chan_tasklet); } =20 - err =3D dma_async_device_register(&ad->dma); + err =3D request_irq(irq, admac_interrupt, 0, dev_name(&pdev->dev), ad); if (err) - return dev_err_probe(&pdev->dev, err, "failed to register DMA device\n"); + return dev_err_probe(&pdev->dev, err, + "unable to register interrupt\n"); + + err =3D dma_async_device_register(&ad->dma); + if (err) { + dev_err_probe(&pdev->dev, err, "failed to register DMA device\n"); + goto free_irq; + } =20 err =3D of_dma_controller_register(pdev->dev.of_node, admac_dma_of_xlate,= ad); if (err) { dma_async_device_unregister(&ad->dma); - return dev_err_probe(&pdev->dev, err, "failed to register with OF\n"); + dev_err_probe(&pdev->dev, err, "failed to register with OF\n"); + goto free_irq; } =20 return 0; + +free_irq: + free_irq(ad->irq, ad); + return err; } =20 static int admac_remove(struct platform_device *pdev) @@ -793,6 +801,7 @@ static int admac_remove(struct platform_device *pdev) =20 of_dma_controller_free(pdev->dev.of_node); dma_async_device_unregister(&ad->dma); + free_irq(ad->irq, ad); =20 return 0; } --=20 2.33.0