From nobody Fri Jul 24 21:52:33 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 26F32401494 for ; Thu, 23 Jul 2026 21:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784842892; cv=none; b=XQYf4YjnH3MlnZJr7iBIHE91kt6E4+MsENgj/pUC28Cpz27DX9MLJAy9TSjyTli6dI2AbsMvB5MrF3TxDxH3g9li+XyJEJXKWDjMPtJnXQ04U30eeCafzkN7cRgpMT2j70ya2IVG/t/TnmU5arXgBrj+CjFQboJ+tZh1AT+Nvpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784842892; c=relaxed/simple; bh=OurC2CGXmWVyVIjyqPmh+99oZP8r+hHQIAxGrWZCINY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=MFUfZZaaXswC9qxkNoYrMJWCah4DNxEgiC9mf39VbRb1j5QxvnMF0IFcaqKNklgBlrZaX69DgvaBq07OyIZxhRz88CyDs7DiIib5mSf/p123G6ROsfJR6iINaZOGF3TX9WrFXuw+Z+gvCmkIuunOqDQAwVhv8wPIqkU4ftHs5Is= 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=U/dYqBa3; arc=none smtp.client-ip=209.85.214.177 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="U/dYqBa3" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2ccf2360620so11730155ad.3 for ; Thu, 23 Jul 2026 14:41:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784842890; x=1785447690; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=th3CyOZRdZ87A8I5Ep9HgiU5HOY6fR9da2kPJ1AbeuI=; b=U/dYqBa34XdKH7vkquHVxDtOvxQFhu0iyyOLe9qFCKEmEgNIHwZIdOiZi2ybK7wVAL 8QaUDtJrIMbtF6/90a8BjPTRGT7T8k3GRxLWIKhYtv65FyNoTkfhDFfbY053eMw6Q7kS uGz43nEno99XcIbad4qBJykJt2caEQDIIn9/hWH6o9sBaOksi8vm3JjoC3rb4rttNL7+ oEqeTyMCz8k+1Pw8dVJmLGTgpvLwoQ2f7J9DbnmfJrhM3Yk2nzR0y+EwwvDU0IFCIw+x cs2sZ0SBz81GXPsa8dpkJPdeNImP274FQVUFXTC7gxGBUKc6tdXRlXmQAIJE+8jzD/BI GBNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784842890; x=1785447690; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=th3CyOZRdZ87A8I5Ep9HgiU5HOY6fR9da2kPJ1AbeuI=; b=RV/jqzSiv6+lPlCHlQrvNBPDv/BIOMJtytENoqGbjgG3f0rfcC+s8vvjPC8wjmEYoE IUxV9eAaaY4ydVJINXRSQ/5N0tlgR1Ylwb9cBYyZbG4mLIedrcf7yUDdFFnYzn+uYwsJ /AeEwUAeZBAsnW0l3qQO/R7U0hzX8zHXWZiwRDMvBFcDGK7RYERQtcMKqUAEOaTttHIb qhiAZ/MyFdGRwJ6Ians+pAAInpeZGvieq8JyCGiOkUTJN4MTpQsgD1J4dVvm4/AbPkZJ Mk1vvBC5qLruNnhKcdPa1igzC+4gJ6r9v1h2VQapsxXqH2v5cTWEjobpFXtQxClUPsl3 VXEQ== X-Forwarded-Encrypted: i=1; AHgh+RpJNHRQKEKCcJj0g7AeyyTnHqnBvMcY6t3ZuRrLtla2gjURfzMbxE1sREuKslLvusdHI9ymr3d7GGmZciM=@vger.kernel.org X-Gm-Message-State: AOJu0YyFh+x0kr3Mcx2KSzE+ywzPdS2Uq1PtP2clpShcEPDxsflRsav+ XXkZ4EuZE4OlnnOSPzl4ANWkP9LddKHYjVtBqSyr8xB4XIPj+Czv60r1 X-Gm-Gg: AR+sD10+VMPrENe8mhfpv5zO2ovp7ZX3nX2n3ati141N6N77l+dWRdtQu2l55a+rG7n 8vEvW76fA6qhcVDnwNSDo4Ul1aVB3Pcx0LXq3ZVBgEpriyQbWvWSDl4HnT33HDw/aBWWBP3u/KV EPkRtEFYrhO9xNCRgLBFaKFWEPJwv28iJ3/7CykD+2jL4Z1M9vimTNqkcC6vBEjic+QC/VNC/1/ v+isLXmMGnGOQBxLTLrmSodzfuFSkD33PperLGSZwqRJ8FGCuWqzsCEuvoHw4H26F2+3bq5WslX d31HDiWD+4XwOIOhqTJLABfpg9dKUKZhtYjWCAAZgKsychBuoAYjfgf9/SbCrcHs0pJVsHleFPJ Y8+vQPxW4JA9dluDuD8GAHhoBaueEe3NGBp+AHPihaNkJnqG42IkRM1chYJSgvHgzLeu1lmAfVT gjOs2whTcfQ/dogNV8OLD9CSKkUJC+EY/wme0sL2q2mFvNgD64vpsuucCjJmTPVEEapaw4LRY5Y +CdGot+w8prd2tsZKU/N+QE93Z/6WAfy8Y+LJxUO2mPY1e6NZMlnJJCxC8fHeBJUQ== X-Received: by 2002:a17:903:26c4:b0:2c9:bd64:8c8b with SMTP id d9443c01a7336-2cfa6c5700emr60569725ad.31.1784842890470; Thu, 23 Jul 2026 14:41:30 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf8efa39e9sm40277195ad.10.2026.07.23.14.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 14:41:29 -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: [PATCH] ata: pata_ep93xx: use devm_dma_request_chan for DMA channels Date: Thu, 23 Jul 2026 14:41:28 -0700 Message-ID: <20260723214128.356942-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert the manual DMA channel request/release in ep93xx_pata_dma_init() to the managed devm_dma_request_chan() API. This removes the now-unused ep93xx_pata_release_dma() helper and the error-path cleanup in ep93xx_pata_probe()/ep93xx_pata_remove(), simplifying the code and avoiding potential leaks if probe fails after DMA init. Assisted-by: opencode:hy3-free Signed-off-by: Rosen Penev --- drivers/ata/pata_ep93xx.c | 50 +++++++-------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 339ee5e43e9f..04ab37134fb2 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -627,18 +627,6 @@ static int ep93xx_pata_bus_softreset(struct ata_port *= ap, unsigned int devmask, return ep93xx_pata_wait_after_reset(&ap->link, devmask, deadline); } =20 -static void ep93xx_pata_release_dma(struct ep93xx_pata_data *drv_data) -{ - if (drv_data->dma_rx_channel) { - dma_release_channel(drv_data->dma_rx_channel); - drv_data->dma_rx_channel =3D NULL; - } - if (drv_data->dma_tx_channel) { - dma_release_channel(drv_data->dma_tx_channel); - drv_data->dma_tx_channel =3D NULL; - } -} - static int ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) { struct platform_device *pdev =3D drv_data->pdev; @@ -655,7 +643,7 @@ static int ep93xx_pata_dma_init(struct ep93xx_pata_data= *drv_data) * to request only one channel, and reprogram it's direction at * start of new transfer. */ - drv_data->dma_rx_channel =3D dma_request_chan(dev, "rx"); + drv_data->dma_rx_channel =3D devm_dma_request_chan(dev, "rx"); if (IS_ERR(drv_data->dma_rx_channel)) { ret =3D PTR_ERR(drv_data->dma_rx_channel); drv_data->dma_rx_channel =3D NULL; @@ -665,14 +653,14 @@ static int ep93xx_pata_dma_init(struct ep93xx_pata_da= ta *drv_data) return 0; } =20 - drv_data->dma_tx_channel =3D dma_request_chan(&pdev->dev, "tx"); + drv_data->dma_tx_channel =3D devm_dma_request_chan(&pdev->dev, "tx"); if (IS_ERR(drv_data->dma_tx_channel)) { ret =3D PTR_ERR(drv_data->dma_tx_channel); drv_data->dma_tx_channel =3D NULL; if (ret =3D=3D -EPROBE_DEFER) - goto fail_release_rx; + return ret; dev_warn(dev, "tx DMA unavailable, using PIO\n"); - goto fail_release_rx; + return 0; } =20 /* Configure receive channel direction and source address */ @@ -683,7 +671,7 @@ static int ep93xx_pata_dma_init(struct ep93xx_pata_data= *drv_data) ret =3D dmaengine_slave_config(drv_data->dma_rx_channel, &conf); if (ret) { dev_warn(dev, "failed to configure rx dma channel, using PIO\n"); - goto fail_release_dma; + return 0; } =20 /* Configure transmit channel direction and destination address */ @@ -694,21 +682,10 @@ static int ep93xx_pata_dma_init(struct ep93xx_pata_da= ta *drv_data) ret =3D dmaengine_slave_config(drv_data->dma_tx_channel, &conf); if (ret) { dev_warn(dev, "failed to configure tx dma channel, using PIO\n"); - goto fail_release_dma; + return 0; } =20 return 0; - -fail_release_rx: - dma_release_channel(drv_data->dma_rx_channel); - drv_data->dma_rx_channel =3D NULL; - if (ret =3D=3D -EPROBE_DEFER) - return ret; - return 0; - -fail_release_dma: - ep93xx_pata_release_dma(drv_data); - return 0; } =20 static void ep93xx_pata_dma_start(struct ata_queued_cmd *qc) @@ -959,10 +936,8 @@ static int ep93xx_pata_probe(struct platform_device *p= dev) =20 /* allocate host */ host =3D ata_host_alloc(&pdev->dev, 1); - if (!host) { - err =3D -ENOMEM; - goto err_rel_dma; - } + if (!host) + return -ENOMEM; =20 ep93xx_pata_clear_regs(ide_base); =20 @@ -999,14 +974,8 @@ static int ep93xx_pata_probe(struct platform_device *p= dev) dev_info(&pdev->dev, "version " DRV_VERSION "\n"); =20 /* activate host */ - err =3D ata_host_activate(host, irq, ata_bmdma_interrupt, 0, + return ata_host_activate(host, irq, ata_bmdma_interrupt, 0, &ep93xx_pata_sht); - if (err =3D=3D 0) - return 0; - -err_rel_dma: - ep93xx_pata_release_dma(drv_data); - return err; } =20 static void ep93xx_pata_remove(struct platform_device *pdev) @@ -1015,7 +984,6 @@ static void ep93xx_pata_remove(struct platform_device = *pdev) struct ep93xx_pata_data *drv_data =3D host->private_data; =20 ata_host_detach(host); - ep93xx_pata_release_dma(drv_data); ep93xx_pata_clear_regs(drv_data->ide_base); } =20 --=20 2.55.0