From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 80C3338239D for ; Wed, 10 Jun 2026 06:58:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781074683; cv=none; b=tkPTjo5HXfHw2OMsLVvgA5rLh0pCTTrGHpEAV6SrtdseVorM2oylB0JunWDrXa+8l+DHNXzANMUTfB1uVilwPBJA/kCG1VnlfKrshAZ0RoXBpIbTp0MOuHNsBMYuqVDnbqvWXB9gtyKv9CnesCxB6zecY4cho5udVuOMbwT11Lc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781074683; c=relaxed/simple; bh=PFSOUWErGrM0gyP5DWUOL09xlM7SxLQPjCGI+uexi2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bdKBYz6LK5uUKhC3no9MM2ckWZl0ET2Hax15xPyp64tqhX1KvyQ1g/9G81/zFXjSavC/rbC1HrTfOIuN0W0YDrK3Epv+cFGPRUjRhKJyVuPlgKqGbkDkw32ZOHUMY0DDADZ71n5BTrb19vFz/gPlA9uKG96xQ9atZUQEpJ9+pPc= 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=FRCMr/oS; arc=none smtp.client-ip=209.85.216.49 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="FRCMr/oS" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-36d9794d82aso4494614a91.0 for ; Tue, 09 Jun 2026 23:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781074680; x=1781679480; 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=XQGlGPeEYvzRxu/p0mp37wOG4b2KqwAVkIGl7gSwHWg=; b=FRCMr/oScs6ZPS3Vg2DFmBqL0HlP9XPvyhTe2IT1wP0qIhfZC4jbnHRWqTkYB13KFh xnpKIJ6tvbwAcMjQuy2Sw+tat1l7SfdM/1VjHhn9lOeQ0m8xVMIjT6PsYJYo8tUAbjlR ML3ZK4TLP9ynskUv7pIKnBTbzxjAnhiCA6jyYhC2eN/X6ARhqbWwomcuYuwliFLymdXC HzERkQJ8WIZwfg9eUOrakbhebgwBa3K46+/sAyXkD+YFv/MbHVe3NikBEwA1kloiskzn NmyyMt8KJB2bseRS0s0UziEtmOYGdJvOBdgrMohcum/yU71Wlq4bJpvdU+YOOz3qywNq lqeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781074680; x=1781679480; 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=XQGlGPeEYvzRxu/p0mp37wOG4b2KqwAVkIGl7gSwHWg=; b=ewtdUgO85AMVupNSkx05hWL5ivZQokN9eZ2igaE7LcsndRUYhici5SP2UhT8RnRnUb n/ntMDrbbTtbNoOVY4v/Hc7zEKzjisyCCP330gSxy92MMKGTG0OnfzdAybteJjRV+wsZ 27aRCkfEUHvQOKKr6XfAFLeJD/MLW1Z2Jf/J7OM/oRTzcF2BGu67XssIsbzL4oMYNS66 JAtY0XQhMXYWaQfX1XHDTfEc9ykPvpHKIpGak8Iusqx1EOFwzyja6i4wCxd/aVKbTifU Fc7iadMlUFHiM16PjrtxKi76SfuOhllR275qk6Vm0syEVOsJFB4vWWro11Uaal4K9fQL jkdQ== X-Forwarded-Encrypted: i=1; AFNElJ8NYiciRafJS050D4VmOznNsE2MumEMxyK86bWqWHxoPho2opivKP0Ccjeq7zYwe1XUwUKDhnvMnoOFVv4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5UEBeHq0xKXeq+B83AUm18kLDwGfWvyzm4gI+mqpILvuwCQEV 3FTSYjpETOZTXORdoRSdMZrUMUEHNxOllNC8oHLhduOnPN9mePqLyQFWli6CnjN/ X-Gm-Gg: Acq92OHSosbV+zIDfKCXbWIFYqO//hawEmfUVpNjl/5HqJf71eJuwwirrk3isfgKLn3 eIavm2hgQJ0SfEoMVQI7DiNF7IOhtWJd4F0kKsbKaRf0dhDH8dhJrBa1oBipw8CCnaVim2qM/pT 1KkBZ09uDdWee9BvGKd1CSw1J2R7O1D4l/DbE+49GBwtQLv1Yu94BA07maURwIkg17i/U7VlCmF gFeTBuGXOeQXO376DUV4Mt1YiTTD0fSbcQrtX/H1Jk5nH3POPo7BzM4eTrrxfy8ePoqdd6aS6o0 siUGC5MU1NhCBvVrm4DTMJCnCDDLPnB6jCGeuzCkb7rOXk44Qyes8GuyNY98SNmQvQ3Y5iMYTvN VpXP/5ELg7nANKQEa9g7LBl8Yjoi3+Izn0aJgYe6MS+X0QxycM71SgLbrGHcOWPD4ULJigAK8Ka MKeU6SCU/wTBRlnA6FIcdsCO5+nbfL7p+fQd1FNyhX4hw337FWreAKX9bYG2WWOCATGRG2tFjbW ZNn9dBK/HjJU7qUy4HiiJmK0q3X47vnOfcN+3cc/li1gw== X-Received: by 2002:a17:90b:1fc3:b0:362:e826:cefe with SMTP id 98e67ed59e1d1-370f0c521b9mr28534032a91.23.1781074679793; Tue, 09 Jun 2026 23:57:59 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36f6bf830b2sm20064781a91.4.2026.06.09.23.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 23:57:59 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Vinod Koul , Frank Li , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/3] dma: mv_xor: use devm for dma pool and irq Date: Tue, 9 Jun 2026 23:57:37 -0700 Message-ID: <20260610065737.118211-4-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610065737.118211-1-rosenp@gmail.com> References: <20260610065737.118211-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 Replace dma_alloc_wc with dmam_alloc_attrs and request_irq with devm_request_irq. This eliminates the need for manual cleanup of the dma pool and irq in both the channel remove function and the channel add error labels, removing the err_free_irq and err_free_dma labels entirely. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/dma/mv_xor.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 3fc39cca7cbd..2ac7f01155fe 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -1013,8 +1013,6 @@ static int mv_xor_channel_remove(struct mv_xor_chan *mv_chan) dma_async_device_unregister(&mv_chan->dmadev); - dma_free_wc(dev, MV_XOR_POOL_SIZE, - mv_chan->dma_desc_pool_virt, mv_chan->dma_desc_pool); dma_unmap_single(dev, mv_chan->dummy_src_addr, MV_XOR_MIN_BYTE_COUNT, DMA_FROM_DEVICE); dma_unmap_single(dev, mv_chan->dummy_dst_addr, @@ -1025,8 +1023,6 @@ static int mv_xor_channel_remove(struct mv_xor_chan *mv_chan) list_del(&chan->device_node); } - free_irq(mv_chan->irq, mv_chan); - return 0; } @@ -1077,8 +1073,8 @@ mv_xor_channel_add(struct mv_xor_device *xordev, * requires that we explicitly flush the writes */ mv_chan->dma_desc_pool_virt = - dma_alloc_wc(&pdev->dev, MV_XOR_POOL_SIZE, &mv_chan->dma_desc_pool, - GFP_KERNEL); + dmam_alloc_attrs(&pdev->dev, MV_XOR_POOL_SIZE, &mv_chan->dma_desc_pool, + GFP_KERNEL, DMA_ATTR_WRITE_COMBINE); if (!mv_chan->dma_desc_pool_virt) { ret = -ENOMEM; goto err_unmap_dst; @@ -1112,10 +1108,10 @@ mv_xor_channel_add(struct mv_xor_device *xordev, /* clear errors before enabling interrupts */ mv_chan_clear_err_status(mv_chan); - ret = request_irq(mv_chan->irq, mv_xor_interrupt_handler, + ret = devm_request_irq(&pdev->dev, mv_chan->irq, mv_xor_interrupt_handler, 0, dev_name(&pdev->dev), mv_chan); if (ret) - goto err_free_dma; + goto err_unmap_dst; mv_chan_unmask_interrupts(mv_chan); @@ -1138,14 +1134,14 @@ mv_xor_channel_add(struct mv_xor_device *xordev, ret = mv_chan_memcpy_self_test(mv_chan); dev_dbg(&pdev->dev, "memcpy self test returned %d\n", ret); if (ret) - goto err_free_irq; + goto err_unmap_dst; } if (dma_has_cap(DMA_XOR, dma_dev->cap_mask)) { ret = mv_chan_xor_self_test(mv_chan); dev_dbg(&pdev->dev, "xor self test returned %d\n", ret); if (ret) - goto err_free_irq; + goto err_unmap_dst; } dev_info(&pdev->dev, "Marvell XOR (%s): ( %s%s%s)\n", @@ -1156,15 +1152,10 @@ mv_xor_channel_add(struct mv_xor_device *xordev, ret = dma_async_device_register(dma_dev); if (ret) - goto err_free_irq; + goto err_unmap_dst; return mv_chan; -err_free_irq: - free_irq(mv_chan->irq, mv_chan); -err_free_dma: - dma_free_wc(&pdev->dev, MV_XOR_POOL_SIZE, - mv_chan->dma_desc_pool_virt, mv_chan->dma_desc_pool); err_unmap_dst: dma_unmap_single(dma_dev->dev, mv_chan->dummy_dst_addr, MV_XOR_MIN_BYTE_COUNT, DMA_TO_DEVICE); -- 2.54.0