From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A00E23D2B1 for ; Thu, 2 Jul 2026 00:04:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782950646; cv=none; b=JWvTHTd/Q8GC+Sk4tqVc9p4udhNDc0yTwc57odjx0IZlJ39fSPcI6XrnXKnI79nIFV/KbxxsMlEmg+kr/a1unRrLUBUNPAidglrq5vmdTy8463K5ZePRb/VqUZQBrruCcsZW5wghphepN1bjAl1Xq3gy37XeFaCt3v+cJH6MM5w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782950646; c=relaxed/simple; bh=tVSOGYvPABB44kDBTtPeT0PZcIIZmuo8dSkfWTdu0WY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AXmIPtaodYIbvb/24PkU/wJ3hr1N1z/jupi68H5G7ZAOdM8cIKjML7nZ/82uLUGNMQnUEO9HHb1CXWobunsKgFzJYcRsCCgoLj04iJiHqc3hcstMhvGMmXUzlGsD0PMmleRgfFc1NC9/R4xp4nCYVo924XJfIAWBWFudTXuNTXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=goHNkwBw; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="goHNkwBw" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2c9b1edf2bdso9902875ad.1 for ; Wed, 01 Jul 2026 17:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782950644; x=1783555444; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cKzPJLKirfbftLn1G5jAp4SVmx2q5SsvmYor83AaAqE=; b=goHNkwBwkX38VM41CXYvYCbHkb8vgYHecsyF4SuwfW/Ek0P4NVvkfyN9a3MP1VgqL2 GFgbTdPANOox4QhtIa4QZXByJgecT6YpQQbgL6uCLPO1cM8SHqjur2sEplTewCNZVD16 JUGdCUeFQ9T6qWtRlVjiYIyi0Fq1dA4ane07mh1IPVNYHNHSlHPpfxSiwNX9PU3SbuvZ Nlpat1AIumf0S1OY6Pt8HCEkgsL+VLsxjfzpLtJsDzZ0JqkWhRjLTNaaQ9Kr7ukNY93p LDvIigV4Xju9KLm4f3y4Ps9CqplfbIKDCsiSqCyNdKxHeFHsUP54R7R0lkui/XBTqobX gJOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782950644; x=1783555444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cKzPJLKirfbftLn1G5jAp4SVmx2q5SsvmYor83AaAqE=; b=cRqfpsOeBFKFSXWEnN2pWXRezEXgoKXWgzhnUFxdK9yY3eJUFCdzZ5ii6HS6xalOEN SZAFGfW4J72JBDvM9t2TbDRQQdto6TKSvDONi5We9x3oUqF9pmbecLZVGuxCLLYlTd4D SocHjPewx8onOOifiKzXFndv2J9LZ1Mmp2yGkn1cNehkf12QNexfQCW5Gak0SGJeGMSV dHFT66LkcO2WpyKa+sAF/oFBW273FStDQQm6jU/aOR+0ODZ4M1U7mRpZadjfj0wGEK5K PgX5zxbz8/1hwBopU3680/yHLeJLN+vaiXqb4rgta0qivCxF9GtvuYDzA0GuLpi8vKDn d98Q== X-Forwarded-Encrypted: i=1; AHgh+RpVHclEr+uzGvoedrTjIqVG+zUBwB0JvpYQ5t/dthxdEWPxMksfn8ysHA+PYFqXjPCwcTXyT9OR+nOIu3c=@vger.kernel.org X-Gm-Message-State: AOJu0YzZdhGwlWYtokRD6Q+v6DbLSwlC7zCK6DDxgYF2IJ9k4Hb2ByQi lrtGkG2BdQcRvJM192Dwt26WlJbHjLSuq6w9xoengs9qzVzA38KjJ8UF X-Gm-Gg: AfdE7claTCGpRvFy7Q8Bu1n7Mrslvb6YqHJOf8i7JXojXZMMUp8IYG4zo2pmT0WlpBD sFHbrLcsbh9bBNA1GqIbL1DjVe1LpSoCamofESFwVC4pOc1G6UvV2S4Qka7FWPQPqa4gxuw0oPz Lj69hMdXT5Zo69puGng1bPKtJ2JlvIUgr7LLmePyfyz4bA5/IcqecYyhZwEJ0ht3wFQDsrVH6YA EnqULsJxyeAcFsvC6mx2PkrmiXejESPw5dEa46ZTB/H5dgEogA2Y4IfFHWYWMPOiGDlWKpT2bON dHjgwRQszU+YyayIH+H4qyELXxg4jvKR7e9I+AAuEdNStaXLSWeDydnHJ3R8iKqG8k5Nndcgh28 6uhLJ73nbpSkaMkU5BYXPo+VEeORFG4YR6hFzi2PVClgPdRD/hI4I0KZ+XXck3irB8Tn3LHsfQ2 bIaZU3BsCaToNGxT0Sw4MP31P6Qjbiqom/QRqGc5+eGRzQ1V5dm84LQf/W5ul6N4HP9w2NZ2s3n 0/VyJd3hQ== X-Received: by 2002:a17:902:eccc:b0:2bf:23c3:34ba with SMTP id d9443c01a7336-2ca7e756e2dmr39116415ad.28.1782950643592; Wed, 01 Jul 2026 17:04:03 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ca9a9fee7csm5023255ad.69.2026.07.01.17.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 17:04:02 -0700 (PDT) From: Rosen Penev To: linux-ide@vger.kernel.org Cc: Damien Le Moal , Niklas Cassel , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2 8/8] ata: sata_dwc_460ex: use devm for old DMA resource lifetime management Date: Wed, 1 Jul 2026 17:03:50 -0700 Message-ID: <20260702000350.68331-9-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260702000350.68331-1-rosenp@gmail.com> References: <20260702000350.68331-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert sata_dwc_dma_exit_old() to a devm action callback and register it via devm_add_action_or_reset() after dw_dma_probe() succeeds. This lets the devm framework handle DMA controller teardown automatically on probe failure and driver removal. As a result the probe function can use plain return-on-error for all failure paths - the dma_initialized flag, the goto labels, and the explicit sata_dwc_dma_exit_old() call in sata_dwc_remove() are all eliminated. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/ata/sata_dwc_460ex.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index e8e2790be1d6..352cd7f02163 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c @@ -222,10 +222,18 @@ static int sata_dwc_dma_get_channel_old(struct sata_dwc_device_port *hsdevp) return 0; } +static void sata_dwc_dma_exit_old(void *data) +{ + struct sata_dwc_device *hsdev = data; + + dw_dma_remove(hsdev->dma); +} + static int sata_dwc_dma_init_old(struct platform_device *pdev, struct sata_dwc_device *hsdev) { struct device *dev = &pdev->dev; + int err; hsdev->dma = devm_kzalloc(dev, sizeof(*hsdev->dma), GFP_KERNEL); if (!hsdev->dma) @@ -245,15 +253,11 @@ static int sata_dwc_dma_init_old(struct platform_device *pdev, return PTR_ERR(hsdev->dma->regs); /* Initialize AHB DMAC */ - return dw_dma_probe(hsdev->dma); -} - -static void sata_dwc_dma_exit_old(struct sata_dwc_device *hsdev) -{ - if (!hsdev->dma) - return; + err = dw_dma_probe(hsdev->dma); + if (err) + return err; - dw_dma_remove(hsdev->dma); + return devm_add_action_or_reset(dev, sata_dwc_dma_exit_old, hsdev); } #endif @@ -1203,19 +1207,12 @@ static int sata_dwc_probe(struct platform_device *ofdev) err = ata_host_activate(host, irq, sata_dwc_isr, 0, &sata_dwc_sht); if (err) { dev_err(dev, "failed to activate host"); - goto error_out; + return err; } /* Enable SATA Interrupts */ sata_dwc_enable_interrupts(hsdev); return 0; - -error_out: -#ifdef CONFIG_SATA_DWC_OLD_DMA - if (!device_property_present(dev, "dmas")) - sata_dwc_dma_exit_old(hsdev); -#endif - return err; } static void sata_dwc_remove(struct platform_device *ofdev) @@ -1228,11 +1225,6 @@ static void sata_dwc_remove(struct platform_device *ofdev) ata_host_detach(host); -#ifdef CONFIG_SATA_DWC_OLD_DMA - /* Free SATA DMA resources */ - sata_dwc_dma_exit_old(hsdev); -#endif - dev_dbg(dev, "done\n"); } -- 2.55.0