From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.tipi-net.de (mail.tipi-net.de [194.13.80.246]) (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 AD3AD2853E0; Thu, 2 Jul 2026 10:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.13.80.246 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782988891; cv=none; b=iLhdkEZ4/GztPG7V1FoWrFu+uwqvgnDb4lHCanql6eh2706aLJb8QDHpTvKFj1aFvTFW2iCu7buHOmiE86NShGUnHo4ZeJa+N1P6sdLIjItpR2oHIvuQutKrzIl7crtMyWxwj/91fsZrEU3JrCoQDxscJADIxurA2AHLpJxP2z8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782988891; c=relaxed/simple; bh=M3UoqmL5niQg2OIf2suRv7Ya/uc+RVEF7hNQr6UkIMY=; h=MIME-Version:Date:From:To:Cc:Subject:In-Reply-To:References: Message-ID:Content-Type; b=IZvCUOUC8cr96aLc68JWY+wO0PcJQxE0ySYixfN/vfcJYE8MGfopoz0fl7qKQixf3wnYK0XS+LSdKEtzn9vCEgNvp4F7/0sjr9giQNGeGeJ/kW250JV86bUvt/4QQcnm5TYPVrkhBhS8bLw1iNqQBjf+rqurI1iETI5z2krMW/k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tipi-net.de; spf=pass smtp.mailfrom=tipi-net.de; dkim=pass (2048-bit key) header.d=tipi-net.de header.i=@tipi-net.de header.b=pByd+uT1; arc=none smtp.client-ip=194.13.80.246 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tipi-net.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tipi-net.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tipi-net.de header.i=@tipi-net.de header.b="pByd+uT1" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3B0DEA47FB; Thu, 2 Jul 2026 12:41:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tipi-net.de; s=dkim; t=1782988887; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=CXkw62+8yRFpZqUrO/8MVocZDBemKbTQnFeIui1gwNo=; b=pByd+uT1lM5pBEHvnD+/KTdBrmlkPULX9sr5EkrUz/0EX5kCZO3J1KtWQ9Uo3vj4TnP4QQ gLMFaNMrJ6aMkby94nRKbZbE/d0VryE9hP+xskb4sIkvefBCinJxkwo+VRChnq4aAnegde B7mEl7OqQXOSvsC4Nn/MJcx1ssA6YzMp/IH7ETlusJwWEc6M5ZLEToH6+C7Xdk767g5l09 k65IlbBKyGii7Npa96+8ZPywc+tSMdsfiQ2U+oPb7RkX6FtGe11hELNkNgWUu2khtmCdjX nsmZeOL86MHX/yrp/4M4l02gIR/8AF4TXki/0SzaLFdNezaojZUToP+B+ylJ4w== Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Thu, 02 Jul 2026 12:41:26 +0200 From: Nicolai Buchwitz To: =?UTF-8?Q?Th=C3=A9o_Lebrun?= Cc: Conor Dooley , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Ferre , Claudiu Beznea , Paolo Valerio , Vladimir Kondratiev , Gregory CLEMENT , =?UTF-8?Q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier Subject: Re: [PATCH net-next v3 01/15] net: macb: drop "consistent" from alloc/free function names In-Reply-To: <20260701-macb-context-v3-1-00268d5b1502@bootlin.com> References: <20260701-macb-context-v3-0-00268d5b1502@bootlin.com> <20260701-macb-context-v3-1-00268d5b1502@bootlin.com> Message-ID: X-Sender: nb@tipi-net.de Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 On 1.7.2026 17:59, Théo Lebrun wrote: > 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(). > > 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 fd282a1700fb..d677a93b9d72 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; > @@ -2711,7 +2711,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; > @@ -2769,7 +2769,7 @@ static int macb_alloc_consistent(struct macb *bp) > return 0; > > out_err: > - macb_free_consistent(bp); > + macb_free(bp); > return -ENOMEM; > } > > @@ -3157,7 +3157,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); > @@ -3202,7 +3202,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; > @@ -3235,7 +3235,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); Reviewed-by: Nicolai Buchwitz Thanks Nicolai