From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 C66BE3E63BA for ; Mon, 11 May 2026 15:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512350; cv=none; b=IS/KK/LupnAIQmIZythwnt+QC02MYEqMYyYt32NQMjyAHxE6IkECWRJ2MPynxQQX9KT5AVUmQy6qygz1FPeIZuPUzkBErwEjFfJQ3ImMVV0vHif3FJI+Fq5CBPudFO81oNxZSS0yVtwnvbpzQVVnxUFWn2uQm8xYuA7lj9TXkrs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778512350; c=relaxed/simple; bh=vwvnf6ebNn/NdvRMiSmEWSC8RhjdM5BZPGxzZ8bBLlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qka55sR8sR5cT+k+m9amK75OdCKjc2fpML2taUUddHYojHNYpU4ZGLAof6ybnObA7z0qYTxaNIp5XUYVOUgTHhdOl9Egk/cZog+V9CYPfttXUGlUYnGdvYFB1a2W2tk5/JR2ehVPw/TtgBW5tMJfKjToq0prGwxO4nWTKnxw/YY= 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=oe6o2xn0; arc=none smtp.client-ip=209.85.216.46 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="oe6o2xn0" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-36648a5f38bso482720a91.3 for ; Mon, 11 May 2026 08:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778512347; x=1779117147; 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=K0LAxw+DkAOqO35713IXuk7e1h9XlRq1lhurgaJrZFk=; b=oe6o2xn0jw9IrMmoKayx1VOFeKsXIR9PFPpcjRkduPsJuuQ9sXv8faf8Fn9EFwClRF 4crc9cLqyTx9cY4rigvGiLRdeQhsMyuDUndnMIInkJnrmxta1GBrRxoajI/EwFTiQq1L hEsdldZulpd7N5ZgxbkWw6PL19eIavGhf62vStu7PkG2AFzGMI3yJzG3kY+UPysLu3kF YBADwEs6kH4sk9oshcGq8tttYJWX3sfdQ9I5xS7xBzaTsoyRZYzczeQQuzifKSrl/u7X HZ2Dvxi9IpyoVxSCEDVMJpdjXmUDNHrSoHFpftDajOgF8WfykWgIW8fO7u4K7DYF/ARe IQLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778512347; x=1779117147; 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=K0LAxw+DkAOqO35713IXuk7e1h9XlRq1lhurgaJrZFk=; b=VoP20OMJQABDVcbRlTWzYqIBFaLE++nErtnOJVmwWd2rXAAcG+EGFymCIOrcW4QDKo GRVSUzJc5iEnAO5JPCq0X37qkykoPgXEbBH71yMR2ZochGI558kHkQtLUh/7rK9uUU72 FJ0Nl6KNUBlultiENzxPoNA7URsWdFMg7Ms5C3gO6BK3J+0s6JHgn0vtEZYk9y5YJHH1 HrpEWl91U+t6/nh+wTvL/aAHsCjJzm4a9LjqxIMz+a9XU8hh7fRcoty9XgZd3VbwyGhM 1nKMLRPQI2peE6b06FtEsxJyqCD33qTiYj08ijFB9mO1Zn61ZBNCPsjWm6hsI3/PdEpV nxLA== X-Forwarded-Encrypted: i=1; AFNElJ9UwCvdPXFLVc55MG3AoTeDyo/rTvX/DbZemE+26d10xW1vrWIvl5/cZ/EFJJvPzm/ch8z0zZUOAgH0n3I=@vger.kernel.org X-Gm-Message-State: AOJu0YyzoOJwfJ2yHEx8mjdKdKqLyG3Ixlwo6RiPV/Dmn1lwRYQMHAl5 5Ntr5FPbRMQtb9Nn75gJzJ/xGnxJ2I3Nvt1renOW5zS/J9KTu4rDRg0s X-Gm-Gg: Acq92OF2/86nHFHpuMiorygu3zWLi+JWctlW+q02XubHvx+YmmDlDjkClPYkBysY443 rT0LqUzXkynJCQa8FREGTyZWALJwsMk0qLxk2Quiv8+R80a0KUNDIa74IsgdfKI/BJeRF3DGSYs zDVTOr9pcUQWPLRNo6IssPoGYcB0kHNbKz+W+cd0QjbK0pk+CtqFuHc62nK7vdjZ9rhybM0qX+1 f+PEWOIhX2SydI0tngEjdGIbSDfRkFprr2dxJm4ME+P/ajGNrbGTQ14OQY44eHMUk/IK7DjAZpC aSM2TujpVMnrgoveRnMX3a5GYRsp9153BSy904dusuq11Hi0ofgSOiHwMaK1VnI7R57ZORfUm61 bLKie8W5DXlaeKo0hiSGFoupNRHrvPlylGBQNdh0TT3XjF5aJZRnLGWuLZYMvQlpW2DpvQBiT8Y ck3YxkImuF1ufWcqXKeM4qioO1sV6hi+quqzaF2zNn7wvHqoUDjfruFeHm3JumXNB/YKnLbmTg9 Y+a7QtV6VJJL8jAdA== X-Received: by 2002:a17:90b:2246:b0:362:be3b:c8d4 with SMTP id 98e67ed59e1d1-365ad70fe5fmr13683480a91.3.1778512346904; Mon, 11 May 2026 08:12:26 -0700 (PDT) Received: from fedora ([2401:4900:bffc:e9a7:49ca:5a41:a2bb:6936]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367d683fa7asm9932363a91.10.2026.05.11.08.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 08:12:26 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v7 1/3] staging: octeon: ethernet-mem: replace pr_warn with dev_warn in free functions Date: Mon, 11 May 2026 20:39:29 +0530 Message-ID: <20260511150931.93382-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260511150931.93382-1-ayushmukkanwar@gmail.com> References: <20260511150931.93382-1-ayushmukkanwar@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 Add struct platform_device parameter to cvm_oct_free_hw_skbuff, cvm_oct_free_hw_memory and cvm_oct_mem_empty_fpa. Replace pr_warn calls with dev_warn, using &pdev->dev for device-aware logging. Signed-off-by: Ayush Mukkanwar --- drivers/staging/octeon/ethernet-mem.c | 31 ++++++++++++++++----------- drivers/staging/octeon/ethernet-mem.h | 5 ++++- drivers/staging/octeon/ethernet.c | 6 +++--- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c index 532594957ebc..af79b2bdac27 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c @@ -5,6 +5,7 @@ * Copyright (c) 2003-2010 Cavium Networks */ +#include #include #include #include @@ -40,11 +41,13 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) /** * cvm_oct_free_hw_skbuff- free hardware pool skbuffs + * @pdev: Platform device for logging * @pool: Pool to allocate an skbuff for * @size: Size of the buffer needed for the pool * @elements: Number of buffers to allocate */ -static void cvm_oct_free_hw_skbuff(int pool, int size, int elements) +static void cvm_oct_free_hw_skbuff(struct platform_device *pdev, + int pool, int size, int elements) { char *memory; @@ -59,11 +62,11 @@ static void cvm_oct_free_hw_skbuff(int pool, int size, int elements) } while (memory); if (elements < 0) - pr_warn("Freeing of pool %u had too many skbuffs (%d)\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u had too many skbuffs (%d)\n", + pool, elements); else if (elements > 0) - pr_warn("Freeing of pool %u is missing %d skbuffs\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u is missing %d skbuffs\n", + pool, elements); } /** @@ -107,11 +110,13 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int elements) /** * cvm_oct_free_hw_memory - Free memory allocated by cvm_oct_fill_hw_memory + * @pdev: Platform device for logging * @pool: FPA pool to free * @size: Size of each buffer in the pool * @elements: Number of buffers that should be in the pool */ -static void cvm_oct_free_hw_memory(int pool, int size, int elements) +static void cvm_oct_free_hw_memory(struct platform_device *pdev, + int pool, int size, int elements) { char *memory; char *fpa; @@ -127,11 +132,11 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements) } while (fpa); if (elements < 0) - pr_warn("Freeing of pool %u had too many buffers (%d)\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u had too many buffers (%d)\n", + pool, elements); else if (elements > 0) - pr_warn("Warning: Freeing of pool %u is missing %d buffers\n", - pool, elements); + dev_warn(&pdev->dev, "Freeing of pool %u is missing %d buffers\n", + pool, elements); } int cvm_oct_mem_fill_fpa(int pool, int size, int elements) @@ -145,10 +150,10 @@ int cvm_oct_mem_fill_fpa(int pool, int size, int elements) return freed; } -void cvm_oct_mem_empty_fpa(int pool, int size, int elements) +void cvm_oct_mem_empty_fpa(struct platform_device *pdev, int pool, int size, int elements) { if (pool == CVMX_FPA_PACKET_POOL) - cvm_oct_free_hw_skbuff(pool, size, elements); + cvm_oct_free_hw_skbuff(pdev, pool, size, elements); else - cvm_oct_free_hw_memory(pool, size, elements); + cvm_oct_free_hw_memory(pdev, pool, size, elements); } diff --git a/drivers/staging/octeon/ethernet-mem.h b/drivers/staging/octeon/ethernet-mem.h index 692dcdb7154d..ff10ba4525ee 100644 --- a/drivers/staging/octeon/ethernet-mem.h +++ b/drivers/staging/octeon/ethernet-mem.h @@ -6,4 +6,7 @@ */ int cvm_oct_mem_fill_fpa(int pool, int size, int elements); -void cvm_oct_mem_empty_fpa(int pool, int size, int elements); +struct platform_device; + +void cvm_oct_mem_empty_fpa(struct platform_device *pdev, int pool, int size, + int elements); diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index d85a9991faf6..31464ed63b58 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -958,12 +958,12 @@ static void cvm_oct_remove(struct platform_device *pdev) cvmx_ipd_free_ptr(); /* Free the HW pools */ - cvm_oct_mem_empty_fpa(CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_PACKET_POOL, CVMX_FPA_PACKET_POOL_SIZE, num_packet_buffers); - cvm_oct_mem_empty_fpa(CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_WQE_POOL, CVMX_FPA_WQE_POOL_SIZE, num_packet_buffers); if (CVMX_FPA_OUTPUT_BUFFER_POOL != CVMX_FPA_PACKET_POOL) - cvm_oct_mem_empty_fpa(CVMX_FPA_OUTPUT_BUFFER_POOL, + cvm_oct_mem_empty_fpa(pdev, CVMX_FPA_OUTPUT_BUFFER_POOL, CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE, 128); } -- 2.53.0