From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 3F9753E5EC1 for ; Mon, 4 May 2026 17:44:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916663; cv=none; b=MCp10W9xEyG0c0/Ig/tsyzgOQGX1wZ1oMT0MoKJ7QO++x1+MInkvaBc+0KI/DWKaBPtwhW4jmuBGxOsTvkc5BFMSttnNdJvSG8sDleQ/adsCrqx2Ry8SnyraVFpuVvU6wPMYruS6fM/bKHO2fAs4tiQxJkuJvsmAbgWXKWKslt4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777916663; c=relaxed/simple; bh=UVPIF+sdrfM6NBHHlN4FeC/sqESWRpaMVlGigUdv/SY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q+YAhkpFhuR945yFyViypQM9g0qXNH7jJ6boS95ZgWusOiKFhgudI70qTwLcb63Rm6QA1SJjOgjxetU+fAGNitEtnberNm9o67yUG3YnahH2eEvAcTNE3v5LpAlK2+uV90o8UOBus77ecaISKr7feZGdYAayCZcCR1xTkrsBxas= 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=sWkRG4KY; arc=none smtp.client-ip=209.85.210.181 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="sWkRG4KY" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8296e257735so300543b3a.1 for ; Mon, 04 May 2026 10:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777916662; x=1778521462; 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=/3r7HpB0/DU/QpLYQMcgaK+OCH5zehE0tbXldsuLb0A=; b=sWkRG4KYJYpyxwvyIQCYlbss5rjHo8QYN/X/JpRbnRGbnrnRoT6Hxr2BVGRrPuE6cb jfWxtwM3m1QuE9WJ3SYm7ygSppvxXjuwZNZ78eAxeQqrdn7PXNNupbqeSF5vnSkeNqw3 6XbRNWdp/mBami6JMCEKpPlclhMWeW68qWyzeRNq7n/KSLKngJc7KZ/Z1uPRJRXLuHPG Vv8Jq8NmLPg4DjsbflXdMAclOesLTDuJO+2U6RNLHxDl9WvIWCM/jMlGB8zeswE63wtT COY21CVhbzk1BE5q+//ToPuh7QdW1igEXdfvgOiZCVAh5ZzS2pU65gbVHcnTdGa1Rs4t 1wpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777916662; x=1778521462; 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=/3r7HpB0/DU/QpLYQMcgaK+OCH5zehE0tbXldsuLb0A=; b=QHQbskchJNU7jmO7a9UhAZj3ldXE2p+YZTJBdid0iFRgZsfZaFNWtWKmfXRWL43INm +UF0JwVr9q4oEogyxWS2FRr3xs3TAZUAWqY4nORjxsaIpw9OT7AU5xB3eKGbMufqMiIi /rB1hEEtWgDbeHtCpFrdHqxDzvlPCMBqGGE2MKQLxbhQwoOxtj2Tuw/6yUeeRmBDgiDT 0kHqMTcoYsx5wP0au+ix6gwucZkH7qDWy/Ngyx4ls4k+d8GupgzOgl423VJPZY88WpzS bta6nLLASpknYzyfO83cyxgBGkBQAVt7Xp43HgEBykPmK1wVbpWKYWPSRZHbitO6jJub NozA== X-Forwarded-Encrypted: i=1; AFNElJ844ufHAOq2c/VZxWy0Vkh5QaRuyfXTURyqZaCQZrTUZxaqD1b6LaHfiPI6yXpjbYuoKz6GM2Q0vyPmJP8=@vger.kernel.org X-Gm-Message-State: AOJu0YxiLkb+/UeszxKuMS9Xo3/v3vHK9moSrtgw5762c7q6+/zbeZiY onrQuQsvsl7LnYNKpz3Ndqw7loXSlvHy08soQDDSdewS74CdzZB39lBLAFIWoQ== X-Gm-Gg: AeBDieuZd9ynFO0bQxemHDra6cEF0vfKatnFlVd6BDDroxq1xoKvfIx2dzSnlzXUJGz LEnXynzdElNY6/YPH/oqVwXZV90TvZ7sKzNSzOyZogU1/EfFByo3E1v6s8knU/GiLrvIGrIzf2T +Q76sznqzWpTN2/sIQTgr8YmOhBgMQrbPfBQoZd118Rggc1xdKFqPa5PS/i/ZbGQ7dJG+Or+LzB TQ9Jo1tLpbEfCxT4UpF2pf7JSJRkcBQkfNgiCeuvVLPgz6wCskcR5m7EqROPaq6q5iK0hckmUQg EuOm6S94DHo/3Ol9yQx+vuzv+lGD2bNNeXcUC6nmE7XPCNP7/5nZ5GpFeObwiNw6x45RZ/VIgi2 JtIJGTrl1wu7ctnAj7lhIEKqSUL24Y7SyIXRgweeWIOH6CypUKBjeNql8PU0wR20DNOIXmmKZNM SJFQgmg2wYtW8g+V92DesfI40kj5iFhx5uaYizUP2GjzbjgERQpmw39YgZ6llybZ9nHYH899LIL 35Bd4G/1BqRvYLuTB3AoDlJMec= X-Received: by 2002:aa7:88c8:0:b0:837:42a6:58a8 with SMTP id d2e1a72fcca58-83742b5accdmr2731386b3a.2.1777916661377; Mon, 04 May 2026 10:44:21 -0700 (PDT) Received: from fedora ([2401:4900:a3fd:82cb:c080:4c49:655c:41ba]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83707fab756sm5923388b3a.44.2026.05.04.10.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 10:44:21 -0700 (PDT) From: Ayush Mukkanwar To: gregkh@linuxfoundation.org, dan.carpenter@linaro.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ayush Mukkanwar Subject: [PATCH v6 1/3] staging: octeon: ethernet-mem: replace pr_warn with dev_warn in free functions Date: Mon, 4 May 2026 23:11:44 +0530 Message-ID: <20260504174146.117026-2-ayushmukkanwar@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260504174146.117026-1-ayushmukkanwar@gmail.com> References: <20260504174146.117026-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..11036c6eb36f 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 eadb74fc14c8..badf5ceaf5b4 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