From patchwork Sun Jan 7 10:02:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 185720 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp471525dyq; Sun, 7 Jan 2024 02:02:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGvmlJ/+cCebB2Fzsy4CWhTjiBZfgWDZeprDqWaqeGxU5P/WE00NQxdTRi2q+RdMq/GkbTB X-Received: by 2002:a05:620a:27cb:b0:781:df48:3d7d with SMTP id i11-20020a05620a27cb00b00781df483d7dmr2709498qkp.9.1704621766304; Sun, 07 Jan 2024 02:02:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704621766; cv=none; d=google.com; s=arc-20160816; b=XDXIMu3/WldL0Bb9GGDtjDcXEGuwsWWnWcHuybkjYMCvm7NOx8MjsiWiIoCcHB49HB QiZzrkO3nBEGy1KzO1GrpRM5CLUxnXTfyCBUx6JV3QExJjPp6G5/lD9HP8ot+FBmruV4 LAlwtzLWNsSzZ+nErBotzYum+Z+f0sPXT4gl+oxEbtjghFv6KGn1v39YuJzmvIWw1V1F /3uJ3E+tOVtclEQoV1+8KFB9AJG88tDFv0QX2DlzVne2C0ClH5/PT828bgMzAK0Tjxhm 8Py39QYuRz+6zhaFiFS4gyObv6/38ckv60jjKHK4VD1YiDfPANZ1Q0TFJrN5+7cBlxG4 C70Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=WHjXr8iYmZyxJWRVeVFfUIvl8ESYTgVff4hTRZ6j4QY=; fh=dNnfSg18Ptr+OweKY4QKN/WRiJyhS4OXToJzVPS7qUI=; b=Dbvs5q6Fblm747YcgVAJgVgtnYw2r9j/M89LDRa/wHnLXlRWUSP1u1uulx4JQxDwER 1uQdOSM8N6FcsxNmYsUFfAuKFFHdmih+0bclAkdmRTHG3QYHev+Lxe7GcclV5xNYg74H 2azzufkgpw6+C6j6n5MDcVVsLiYThx7puFPfUw+MYDtKV9BTDCEYuX+pwo5YoBFGFqsk CeNi4bQR+HINlIMj3ofEWxQjyhzdxxbyJyI3CgDTWbf1uDiWHywSdAcSmlNw5WcDJKjT jk8li6QDHTiPFV6tmJwUTUDDfGXBRig4KLITCXOtzE9HrBUAJuMRx9WR3tLelwSKlFXe Dkog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=kIySmNNe; spf=pass (google.com: domain of linux-kernel+bounces-18829-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id du29-20020a05620a47dd00b00781571bb89bsi5216388qkb.172.2024.01.07.02.02.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 02:02:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18829-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=kIySmNNe; spf=pass (google.com: domain of linux-kernel+bounces-18829-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1A8CA1C21456 for ; Sun, 7 Jan 2024 10:02:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 35774134B2; Sun, 7 Jan 2024 10:02:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="kIySmNNe" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.smtpout.orange.fr (smtp-29.smtpout.orange.fr [80.12.242.29]) (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 BD97312E68 for ; Sun, 7 Jan 2024 10:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from pop-os.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id MPysrRwtE9WXyMPz1rZ57p; Sun, 07 Jan 2024 11:02:19 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1704621739; bh=WHjXr8iYmZyxJWRVeVFfUIvl8ESYTgVff4hTRZ6j4QY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kIySmNNe2Zo+v+2ODdcfgIetNBd42jrc8kK0zax81Q2dAITnszJqtjcq5EbTR8Vp0 N6sEdpTJslfgaoDl45o2kiy2ZM8lsLvxMcH/Y04ZJ847XOSjSFOPo0wEkiHsZ2gFcC L3O13SXHpNrTETWVtm5OflWMaLGgxTte43+RnJaO2W/CwJNYP43LdDh06WqhwZnCvR Zu1kcbFcpmZOfvfvriKPytSpidAuJBcgeSpl2JF1dUnNXo3qE0gsh7UdKje0u8ETtf khAEqokUaK13K6Q3uAhL0SUcA07B8oPYEGearxk7NMRp64QJw0CAy6K6YF3Ie8902K jI2HE2bZgy6+g== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 07 Jan 2024 11:02:19 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: vkoul@kernel.org, jiaheng.fan@nxp.com, peng.ma@nxp.com, wen.he_1@nxp.com Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 1/3] dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMA Date: Sun, 7 Jan 2024 11:02:03 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787425473061930993 X-GMAIL-MSGID: 1787425473061930993 This dma_alloc_coherent() is undone in the remove function, but not in the error handling path of fsl_qdma_probe(). Switch to the managed version to fix the issue in the probe and simplify the remove function. Fixes: b092529e0aa0 ("dmaengine: fsl-qdma: Add qDMA controller driver for Layerscape SoCs") Signed-off-by: Christophe JAILLET --- drivers/dma/fsl-qdma.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c index 47cb28468049..38409e06040a 100644 --- a/drivers/dma/fsl-qdma.c +++ b/drivers/dma/fsl-qdma.c @@ -563,11 +563,11 @@ static struct fsl_qdma_queue /* * Buffer for queue command */ - status_head->cq = dma_alloc_coherent(&pdev->dev, - sizeof(struct fsl_qdma_format) * - status_size, - &status_head->bus_addr, - GFP_KERNEL); + status_head->cq = dmam_alloc_coherent(&pdev->dev, + sizeof(struct fsl_qdma_format) * + status_size, + &status_head->bus_addr, + GFP_KERNEL); if (!status_head->cq) { devm_kfree(&pdev->dev, status_head); return NULL; @@ -1268,8 +1268,6 @@ static void fsl_qdma_cleanup_vchan(struct dma_device *dmadev) static void fsl_qdma_remove(struct platform_device *pdev) { - int i; - struct fsl_qdma_queue *status; struct device_node *np = pdev->dev.of_node; struct fsl_qdma_engine *fsl_qdma = platform_get_drvdata(pdev); @@ -1277,12 +1275,6 @@ static void fsl_qdma_remove(struct platform_device *pdev) fsl_qdma_cleanup_vchan(&fsl_qdma->dma_dev); of_dma_controller_free(np); dma_async_device_unregister(&fsl_qdma->dma_dev); - - for (i = 0; i < fsl_qdma->block_number; i++) { - status = fsl_qdma->status[i]; - dma_free_coherent(&pdev->dev, sizeof(struct fsl_qdma_format) * - status->n_cq, status->cq, status->bus_addr); - } } static const struct of_device_id fsl_qdma_dt_ids[] = { From patchwork Sun Jan 7 10:02:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 185721 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp471712dyq; Sun, 7 Jan 2024 02:03:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IHA0erri9AxofPvSujKVbITsVul/je8u867mJqLmflm/ycsSfmMFTg6E0zCTf51YxBzNWcX X-Received: by 2002:aa7:c399:0:b0:556:3826:be68 with SMTP id k25-20020aa7c399000000b005563826be68mr912144edq.84.1704621790044; Sun, 07 Jan 2024 02:03:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704621790; cv=none; d=google.com; s=arc-20160816; b=rO358WHVet7+XoOBHNg3ZB9N0+iYDw5f0nuQFhm1j55ntEI9fFkCnSunGBLGkWQcTo HA4vWUCzLo20fGQPHOdc0zCNL/MUSpOPkwW9GoVMa8xiBZW3+tNL+mqrbyDYSlaGbS6K 0i60aHMLFmoMRiTy5m3ePnIlOd4Lt68Y7QrmnYw7HSVyi+6/8KLeZOwy+deuNRwJ190m v09Q0Xr5/lNc1CW36HCYYqHVZU9eMquUoyzQiLYtwWGSvFZasmGPlX5BeZN/ghpqufQZ qEUZCFSEOsnzOX6BgPLEjVC2L6iNK9vNtH9WKzzbjvjg21jW+aVycpA/UXoYshcxqwGX FUNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=aJxzVqIgfQ6I8zkGzF9gzvRPzwUJvo/hE6MLhe9DP3E=; fh=dNnfSg18Ptr+OweKY4QKN/WRiJyhS4OXToJzVPS7qUI=; b=ZtzeRegThB/Uw6wC2eunR27PSLZ8gXBQmPKTZc1n90c8eQKFC5EaXBquSA3MMbKDvH IMBBs4eTeAjLoTnnyZyPYjTREEWgaiwSLuUDgod19jC8T6X+aM+1GbJ4Tk1QAHV5N5eN nMNA0ryr1HhZ6nvVrFcQwGvOjWUMHorYQlRW9/gJWqqe1rHf2rnuN2QlABXYB5vNYXkU CxhSImiyPTaE7ga2pwH2QZzyiCLh9VtUAmXDo/1Yo4WaS46b0iG2z0BxWkR0Ybf/00Gw pQfsEcS9ezayRujt7WupxvggBxQRZHTGOoAP2VIranAubufyPIbclQPUw7ZQIU8bR4sc jnfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=NVbya2GM; spf=pass (google.com: domain of linux-kernel+bounces-18830-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18830-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id w4-20020a05640234c400b005571feabd60si2190425edc.667.2024.01.07.02.03.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 02:03:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18830-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=NVbya2GM; spf=pass (google.com: domain of linux-kernel+bounces-18830-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18830-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A352B1F21C36 for ; Sun, 7 Jan 2024 10:03:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E05F13AC0; Sun, 7 Jan 2024 10:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="NVbya2GM" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.smtpout.orange.fr (smtp-29.smtpout.orange.fr [80.12.242.29]) (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 C00F9134A0 for ; Sun, 7 Jan 2024 10:02:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from pop-os.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id MPysrRwtE9WXyMPz3rZ58J; Sun, 07 Jan 2024 11:02:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1704621742; bh=aJxzVqIgfQ6I8zkGzF9gzvRPzwUJvo/hE6MLhe9DP3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NVbya2GMo5OoRxXFFv5NHUY1L5eI3ttmziRZBoCzBx3k2g4l0RVemOhW3s3ev15Xv JP/ka/4sMZzNpbbS8uvsrd3/rztuz7RryCRIJMQGZFUSLh8VnkKFzr7RVGnExUiksG DEXImPZ8BoBYIrbooWiLi9qNF1goQR+I9HAlwxQVfMQVLwrQCadDteRFR7XJL6CKOO LlUeOs+jWHBgAkrJt5vBJGUAHhaAlVRss9zch1nNUEm58zs3yDixHuNLxi6zKqJo/6 bChNKkx+GYaL1pRF5lQXh79VqNUNTWZRIU6ShctpGHEUEtsiVfFhuGCBmZo2vjYwSJ 9G/EdahnL8X9g== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 07 Jan 2024 11:02:22 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: vkoul@kernel.org, jiaheng.fan@nxp.com, peng.ma@nxp.com, wen.he_1@nxp.com Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 2/3] dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA Date: Sun, 7 Jan 2024 11:02:04 +0100 Message-Id: <7f66aa14f59d32b13672dde28602b47deb294e1f.1704621515.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787425498278310420 X-GMAIL-MSGID: 1787425498278310420 This dma_alloc_coherent() is undone neither in the remove function, nor in the error handling path of fsl_qdma_probe(). Switch to the managed version to fix both issues. Fixes: b092529e0aa0 ("dmaengine: fsl-qdma: Add qDMA controller driver for Layerscape SoCs") Signed-off-by: Christophe JAILLET --- drivers/dma/fsl-qdma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c index 38409e06040a..3a5595a1d442 100644 --- a/drivers/dma/fsl-qdma.c +++ b/drivers/dma/fsl-qdma.c @@ -514,11 +514,11 @@ static struct fsl_qdma_queue queue_temp = queue_head + i + (j * queue_num); queue_temp->cq = - dma_alloc_coherent(&pdev->dev, - sizeof(struct fsl_qdma_format) * - queue_size[i], - &queue_temp->bus_addr, - GFP_KERNEL); + dmam_alloc_coherent(&pdev->dev, + sizeof(struct fsl_qdma_format) * + queue_size[i], + &queue_temp->bus_addr, + GFP_KERNEL); if (!queue_temp->cq) return NULL; queue_temp->block_base = fsl_qdma->block_base + From patchwork Sun Jan 7 10:02:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 185722 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp471746dyq; Sun, 7 Jan 2024 02:03:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IG69NXk/dMN8g8zP88udf/9vhG4HeQ6PSCuF8HCOawtszhFGAQCusGz3Te6X2G14VSWJ8FQ X-Received: by 2002:a05:622a:152:b0:427:7da3:13d5 with SMTP id v18-20020a05622a015200b004277da313d5mr3032584qtw.39.1704621796342; Sun, 07 Jan 2024 02:03:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704621796; cv=none; d=google.com; s=arc-20160816; b=1G2H2afhZunpB+liv2yHBCRn3oOL4XNekOtbjOxPBlHdlrLH10pNufAdzx+ssocKQP XHNG0fguCJrv17ao0L0uif1FFJirHPQc3PBVDXXYbOcBvRfJ7PmDpWObggpc1K+594Nh 3MOLuB9WHtLQ2GMiekst7jd9ZKoGDXt9vancpO/2FrPCYZpNPfwy5DCcjfDkcNloFfwt 6DdftFsMzASS3mXXrJjNrc/VYP6eIiJv8uvKxpe4VKKwBhPq3O2DrjWJTdkgVT0BnFya PjqELaMKYRDYtum9vmQv+pLamOOBXZh/ZpL7/cp93ZGC5jZJVdh1bmCeqx7DkzRxAmlK WmAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=guYrmHlQaEIHvMVuPCB9rU52mx7/3tAlTfVlX+gCQPE=; fh=dNnfSg18Ptr+OweKY4QKN/WRiJyhS4OXToJzVPS7qUI=; b=s/qUW4ukSqHE3j1T2LSc/LvlNIErRwXjZ5s/VyyyS3y/648FWp17R2Sot4oO36lJpv FoUQ1ByukZCpl5ZJYfb4zyIXQTBd1JmR5oXOgeF6EvoAzpH9DINzcvudjINRhpqpBske aet4CIpNE5OB4cmQDivpFwCyYKBXbg2WyO2YDuyDy6AypRg3Pe53j+HysK1Fr9xw14qP IbHC+pr1GKemS0Si17tV9CzBnTKq/WxD3cuz+C6j4Gu2LPeSQSKYweZaSWW01010irsL e8QWdkH/Q77XIPgVna8LOEXSpbUIWiZBReho9D2srDVG5Ol9XzHH26fcnYRItdh69eea /XXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=Nc0LOoB1; spf=pass (google.com: domain of linux-kernel+bounces-18831-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18831-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id y10-20020a05622a164a00b00425814dc80fsi5340595qtj.333.2024.01.07.02.03.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 02:03:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18831-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=Nc0LOoB1; spf=pass (google.com: domain of linux-kernel+bounces-18831-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18831-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 273211C20C34 for ; Sun, 7 Jan 2024 10:03:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 93E7E13ADB; Sun, 7 Jan 2024 10:02:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="Nc0LOoB1" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.smtpout.orange.fr (smtp-30.smtpout.orange.fr [80.12.242.30]) (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 BCE4F12E5C for ; Sun, 7 Jan 2024 10:02:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Received: from pop-os.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id MPysrRwtE9WXyMPz5rZ58k; Sun, 07 Jan 2024 11:02:23 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1704621743; bh=guYrmHlQaEIHvMVuPCB9rU52mx7/3tAlTfVlX+gCQPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Nc0LOoB13e1Vp9mhdupgtFzzwr/c6ClTvOLRElyJK8sw2al1sVCU51swf35Nd7DP3 FPi5/N89KAt5lMcBZgNlCur5gjUts6yJRB5+pwWlVVf3Y7BO5sRXPkHFE+JyviyPs1 1Mz67yh96ZIqXVYJTW1I9Y0XQuqjwbCd1RgJdoeBZbiww2xsw78yBwnfWgNhn1rNDR P6LXNjRAzAMCTXmcRycl00hvHtO3POtc26EJWmV4P6mhBfLRtnFltKoYbrKa12Ae+i 0EqUdH87+0wSk44ootj5AMcCMTR7qU98i81pc69HKcNsXxJugIBB+Jt8FATsjuA01+ tOk4F1KFo2qnQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 07 Jan 2024 11:02:23 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: vkoul@kernel.org, jiaheng.fan@nxp.com, peng.ma@nxp.com, wen.he_1@nxp.com Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 3/3] dmaengine: fsl-qdma: Remove a useless devm_kfree() Date: Sun, 7 Jan 2024 11:02:05 +0100 Message-Id: <6b7f60aa2b92f73b35c586886daffc1a5ac58697.1704621515.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787425504290914248 X-GMAIL-MSGID: 1787425504290914248 'status_head' is a managed resource. It will be freed automatically if fsl_qdma_prep_status_queue(), and so fsl_qdma_probe(), fails. Remove the redundant (and harmless) devm_kfree() call. Signed-off-by: Christophe JAILLET --- drivers/dma/fsl-qdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c index 3a5595a1d442..f167c96f3fe8 100644 --- a/drivers/dma/fsl-qdma.c +++ b/drivers/dma/fsl-qdma.c @@ -568,10 +568,9 @@ static struct fsl_qdma_queue status_size, &status_head->bus_addr, GFP_KERNEL); - if (!status_head->cq) { - devm_kfree(&pdev->dev, status_head); + if (!status_head->cq) return NULL; - } + status_head->n_cq = status_size; status_head->virt_head = status_head->cq; status_head->virt_tail = status_head->cq;