From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D18D446BE1; Fri, 31 Jul 2026 16:34:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515672; cv=none; b=NhJx1KcCb58BO7a8JezcmzoFlUp9ou6BhIeUUFGoTHGpAsPxBnEQZgHcHadYs/BPSgwpwXxV2aj/r6XYmZvr/PHhxbFUUt2yvcl7SoT/YAo12dEw7ZMTjL6Vn8SQjI/pw0LiJoH5/bsDvW8Dl4CJ6TuBtrRrRkXUk3LgboP/74c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515672; c=relaxed/simple; bh=Wi36SgcEF4jXZY5zwy4bZL6IaCbc/oQ68Ak4tr51lzQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AHIvp7mIEyDNDgN0CA8+ZOobbLyQ2eGj67uLRf7nATD/BraseyMf+NwOHGATZThgQwksb5idwTjuE4n+k0yD6Swls9BPmFkxA5ZbwRgMBNx0k/fscgfbW35kW/2vxWnG5/PFA2sSEL9cjORFrVlUP7MsG9aFZUIqgNedxrgGaoI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=ZDCKv46c; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="ZDCKv46c" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 766E21A130F; Fri, 31 Jul 2026 16:34:28 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 3FBEE6039A; Fri, 31 Jul 2026 16:34:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2D52711C16AE8; Fri, 31 Jul 2026 18:34:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1785515666; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=8uzWzN7zqZDpVjQrk89Z/GfipZT+FPIRSZOhy6RR3yI=; b=ZDCKv46ckUogfBqTdBMllOzrcxOIOpCmZgEoGhnWL6/W+x7ZqYmFiswTJxSxhQ08jyoY/3 jsaqZPQwRDFudYctBj7g9dIe7JjLV24nXa5axr7V2r2IK/Hl+RwDGEb9UwoeGtUzuIzOOH va9D/w32t6RkJ3OWmRMznn4qOFyEogkJS3ZzGKfx8ysbiMO7pIW7GAefMeNAPvNPwZcE7p XcZ6s4CJsbhQcQ37d4LiY+oaC4NobzMSu3fI1yGQbOKHFqffe0IFkVAlFw2GDluukQQdXS FeB0yMMPzwNjUoTMssvTW1AVNAEFkGpbkRL7fRb9OfKAbWJTm7sdt9lMxgM6pw== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Fri, 31 Jul 2026 18:34:11 +0200 Subject: [PATCH net-next v6 01/16] net: macb: drop "consistent" from alloc/free function names Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260731-macb-context-v6-1-49d5a1439d48@bootlin.com> References: <20260731-macb-context-v6-0-49d5a1439d48@bootlin.com> In-Reply-To: <20260731-macb-context-v6-0-49d5a1439d48@bootlin.com> To: =?utf-8?q?Th=C3=A9o_Lebrun?= , Conor Dooley , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Ferre , Claudiu Beznea , Paolo Valerio , Nicolai Buchwitz , Vladimir Kondratiev , Gregory CLEMENT , =?utf-8?q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier X-Mailer: b4 0.15.2 X-Last-TLS-Session-Version: TLSv1.3 Since commit 4df95131ea80 ("net/macb: change RX path for GEM") those functions have not been only allocating or freeing consistent memory mappings. Rename from macb_alloc_consistent() to macb_alloc() and from macb_free_consistent() to macb_free(). Acked-by: Conor Dooley Reviewed-by: Nicolai Buchwitz Signed-off-by: Théo Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index d394f1f43b68..ae7d4bb2706b 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2646,7 +2646,7 @@ static unsigned int macb_rx_ring_size_per_queue(struct macb *bp) return macb_dma_desc_get_size(bp) * bp->rx_ring_size + bp->rx_bd_rd_prefetch; } -static void macb_free_consistent(struct macb *bp) +static void macb_free(struct macb *bp) { struct device *dev = &bp->pdev->dev; struct macb_queue *queue; @@ -2728,7 +2728,7 @@ static int macb_alloc_rx_buffers(struct macb *bp) return 0; } -static int macb_alloc_consistent(struct macb *bp) +static int macb_alloc(struct macb *bp) { struct device *dev = &bp->pdev->dev; dma_addr_t tx_dma, rx_dma; @@ -2786,7 +2786,7 @@ static int macb_alloc_consistent(struct macb *bp) return 0; out_err: - macb_free_consistent(bp); + macb_free(bp); return -ENOMEM; } @@ -3174,7 +3174,7 @@ static int macb_open(struct net_device *dev) /* RX buffers initialization */ macb_init_rx_buffer_size(bp, bufsz); - err = macb_alloc_consistent(bp); + err = macb_alloc(bp); if (err) { netdev_err(dev, "Unable to allocate DMA memory (error %d)\n", err); @@ -3219,7 +3219,7 @@ static int macb_open(struct net_device *dev) napi_disable(&queue->napi_rx); napi_disable(&queue->napi_tx); } - macb_free_consistent(bp); + macb_free(bp); pm_exit: pm_runtime_put_sync(&bp->pdev->dev); return err; @@ -3252,7 +3252,7 @@ static int macb_close(struct net_device *dev) netif_carrier_off(dev); spin_unlock_irqrestore(&bp->lock, flags); - macb_free_consistent(bp); + macb_free(bp); if (bp->ptp_info) bp->ptp_info->ptp_remove(dev); -- 2.55.0