From nobody Sun May 24 20:34:47 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 DC8133D9DA2 for ; Thu, 21 May 2026 12:49:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779367783; cv=none; b=gGZt4mH+G5s/QZeW1315ZmBXElRyyvDv4Av1gl2U1ehDAhBngN1gdObe1At58ViBwwXmjkQQJxd/xISy70oa0G/HDKvHs5LoHpj4MceJ3SGP+ShukQ6yD8yvXxJieSMPlNz4TkimKo4aWYotP9JglA5iurtMfPxpViBn5cnxoa8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779367783; c=relaxed/simple; bh=wigWFtjyEa+VCBZgvrGiZjEW95od0zj93AXCLLanc/A=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=i424UxguXza/IZyYY/jUl5V5rgtJococc2V8V1Yz7e+K1cYjKWavYKPoI0EmQPvte+Deic3Agj38RfpcHnZCThQNZJ4C3PGGNm0B37wJySvkxYmyzVjlvjrtIFgphar/02tMASE4EUKz7zdJaFZ7SJcyCNgPy4WBkbmz4UnzsVY= 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=VaykBOUh; arc=none smtp.client-ip=209.85.128.42 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="VaykBOUh" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48fde648a71so43859805e9.0 for ; Thu, 21 May 2026 05:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779367780; x=1779972580; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=3FOLDoUTVhvtMvpFRrgXFdt2ND7UZm3SuSUfzhbpzKo=; b=VaykBOUhtlW88xUww3Jn5n8ZoH/J009CQrx1v1vDaCNrv3+YyuH/fRW2keFMJzUlVX VdEGp0dnCqEdkx9wl+a8j7+8Q9/SERvqCcnXg9ZwfrjRvDe4w3DhYB6NEjbNDwXh61HL hfEX2fBsGwsUFq4yYoD6BddM+16lBOR/yXgto2fZGDJb0wZOAW8ffS0D60mRhTrvNMiq IXruIKVEmjHzAX4Tu0UmfNMrzBNcRGOOplb2hDcgIL/NPdS/2ECYJO4oO9fNAwCyEFPf +xHyv4zHnCaI93HCTE3MIyZKLtrDrclTvN+KszVa/Ojru1dZc7NIwFl6EikzLxvSgP9y q4fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779367780; x=1779972580; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3FOLDoUTVhvtMvpFRrgXFdt2ND7UZm3SuSUfzhbpzKo=; b=PqRr1lQ4l+Sv40QKibf9ZMLrgNUNV09UCNC9w5frhwvmuY+23s2SnPxVOC3W6tnska oNH77b5bwUdeE12xbrRQqWZkLkeMOJ2a7/PpTgVKBBi8fb1SSXctCrmYEb0jMO/cMxhM vwXv4Rpl0K+QM6LvL17Xm+67Tp0rrsd4hIx3WbNYz7QpP9RbZDxmkl0sY6XGPcwlxBOu LPUZC7DmvG4OnfCijO6klBqt08gl+ILml6KKH3yxnx6Y48cmk3DRWllZqrq+emRZ7n8r QWnWd/AJPrXhqdlAwLrp3Gu997gAf90ieDl0uFlGecFdBiDFJTSwHPR+v1noYNqdeiRq v2dw== X-Forwarded-Encrypted: i=1; AFNElJ9PJOEJg5LbRzUpQrKSi24TMIgeoF4OvxM9bldcszatrZvDIj1y8TFj9Llh4R0QJYI4L5S/y9GhW5CEZoY=@vger.kernel.org X-Gm-Message-State: AOJu0YwDXoQareDFavMLnYV1xo5JtOPlEdW/IhEzJWQ6cEeIanhWwZtv HR5G/bJOuz34Cb+R2A+/Xi3j7u6UOg/D86GbnSUdDEeBRH5u3oX6vIh4 X-Gm-Gg: Acq92OHEbyNDJeBvlHE/DdH8UR/rHmFN20yKzxrIwhe7GSYw21M8qF+llhQzh75+Cy6 g6+8NMX/CMFf3zO25oybFf2nAnSS+37yY6CRobQcOWspAWG6g46ec1uhZ6cDP89fiCtQDsC60Qb xV+yDB7pco+wTLsHMB0YfNJ6Hth7U1hzZ3iN5ZjOxcjTcM3zTINDMEFlgHt+1t7o8tsvA5Mx3i/ C1C0WZ0vaIJZgLo7UNwox6FigZNWfntPEHKEddPdcCBLrok9SmDQJH+TPWh+hy/3j23ubHh5bs7 VDR2JjURddITnjETNqdZTBeDThPXSd2V18HRhDtEkrAuP/vBVaXYV4W5GQCiM+1x8ZPQfckyeRn Eft7F6Wk8fueCtzL1VzalEMLHIQyNuqXisBO44SwJvoliz1tyQloeoDQNlZt80VjGsnikLFq3hd f1eHqYTgV5hbAe6l14b8kqDvE= X-Received: by 2002:a05:600c:8286:b0:489:32b:ac0b with SMTP id 5b1f17b1804b1-4903606a0bdmr35037485e9.6.1779367780083; Thu, 21 May 2026 05:49:40 -0700 (PDT) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49035c219a0sm16144605e9.5.2026.05.21.05.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 05:49:39 -0700 (PDT) Date: Thu, 21 May 2026 15:49:36 +0300 From: Dan Carpenter To: David Carlier , Horatiu Vultur Cc: UNGLinuxDriver@microchip.com, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH net-next] net: lan966x: cleanup error handling in lan966x_fdma_rx_alloc_page_pool() Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This code works, but there are a few things to tidy up: 1. No need to an unlikely() because IS_ERR() already has an unlikely() built in. 2. No need to use PTR_ERR_OR_ZERO() because it's not an error pointer. 3. Use the returned error code directly instead of using groveling in rx->page_pool to find it. Signed-off-by: Dan Carpenter --- drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c b/driver= s/net/ethernet/microchip/lan966x/lan966x_fdma.c index f8ce735a7fc0..2d1c38289bb4 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c @@ -91,7 +91,7 @@ static int lan966x_fdma_rx_alloc_page_pool(struct lan966x= _rx *rx) pp_params.dma_dir =3D DMA_BIDIRECTIONAL; =20 rx->page_pool =3D page_pool_create(&pp_params); - if (unlikely(IS_ERR(rx->page_pool))) + if (IS_ERR(rx->page_pool)) return PTR_ERR(rx->page_pool); =20 for (int i =3D 0; i < lan966x->num_phys_ports; ++i) { @@ -106,7 +106,7 @@ static int lan966x_fdma_rx_alloc_page_pool(struct lan96= 6x_rx *rx) rx->page_pool); } =20 - return PTR_ERR_OR_ZERO(rx->page_pool); + return 0; } =20 static int lan966x_fdma_rx_alloc(struct lan966x_rx *rx) @@ -115,8 +115,9 @@ static int lan966x_fdma_rx_alloc(struct lan966x_rx *rx) struct fdma *fdma =3D &rx->fdma; int err; =20 - if (lan966x_fdma_rx_alloc_page_pool(rx)) - return PTR_ERR(rx->page_pool); + err =3D lan966x_fdma_rx_alloc_page_pool(rx); + if (err) + return err; =20 err =3D fdma_alloc_coherent(lan966x->dev, fdma); if (err) { --=20 2.53.0