From nobody Thu Dec 18 07:32:04 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 46E712690D7; Thu, 13 Mar 2025 16:14:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882481; cv=none; b=SOgfHJfIfiG2hRgjgbrp4+vOw765Jz6VVzc+1zIXFZX6n5trb3euer+n5HX5f5LLXyQ5H3I0LOGxTfBETNbU0NAuLAONNydvn8hT2zNxeZSIbmT1OzvR1EMo9e0IY22u3tkJb6ZNUhCndk0Cq4hImvT/j3xIf1g3YaQ44jTdtVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882481; c=relaxed/simple; bh=XHzsxcNRyzu969GVfBaBMQi0w2xQRXFs1QAQkqGdpgg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H0D2/xV08DOSaLniGI1T6NF46uQGNuOkIUZsRW4juGgZ5y8KMrsX/ijgYQ9pPaEiQbEkCu43o9rfJI9eKZhD8cWGrI2eq6DrSfUhFmbIDx+Nlh8lyJBX3zT/B24o1yeM2JgaBXNnFq+z+fY7OS/YlP3icFOza9wra/BKsyXp7Fs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LlpPk8S1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LlpPk8S1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4906EC4CEEE; Thu, 13 Mar 2025 16:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882480; bh=XHzsxcNRyzu969GVfBaBMQi0w2xQRXFs1QAQkqGdpgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LlpPk8S1uGh9d6LTFPnY1jA7rpW3bHVSbItI+9C8P5cs7ggGtYxf5Yaf9t/QbkwgD t8x08DBY943XhQZDV0ch9NDCFaDhT20Ev7EZgb9YDzlwGJ0lDEgWXnwYDkBhCPXwz8 xRB9VHHS3voN+uQysbf7LO1Zs+nCu6xGHKXKudMCgz8PHd0Uo7pUlmDVtIHpZoNen9 AfFXusG6JUv39qIui9pjsw/h8yMM6+/ETJ8Y98s/kGiRkcuDgtJoZvK1YsyBZyBJIX T6bJ13b4KsWm55FEbyZt6ilgkSO47piInHLEGhzEPw4F0wOCyGKwkT/0m+sZpyhwVK +sMwlNKHGVf8A== From: Philipp Stanner To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Yanteng Si , Huacai Chen , Yinggang Gu , Serge Semin , Philipp Stanner Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Philipp Stanner , Andrew Lunn , Huacai Chen , Henry Chen Subject: [PATCH net-next 1/3] stmmac: loongson: Remove surplus loop Date: Thu, 13 Mar 2025 17:14:21 +0100 Message-ID: <20250313161422.97174-3-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313161422.97174-2-phasta@kernel.org> References: <20250313161422.97174-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" loongson_dwmac_probe() contains a loop which doesn't have an effect, because it tries to call pcim_iomap_regions() with the same parameters several times. The break statement at the loop's end furthermore ensures that the loop only runs once anyways. Remove the surplus loop. Signed-off-by: Philipp Stanner Reviewed-by: Andrew Lunn Reviewed-by: Yanteng Si Reviewed-by: Huacai Chen Tested-by: Henry Chen Reviewed-by: Jacob Keller --- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-loongson.c index 73a6715a93e6..e2959ac5c1ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -524,7 +524,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, c= onst struct pci_device_id struct stmmac_pci_info *info; struct stmmac_resources res; struct loongson_data *ld; - int ret, i; + int ret; =20 plat =3D devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL); if (!plat) @@ -554,14 +554,9 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, = const struct pci_device_id pci_set_master(pdev); =20 /* Get the base address of device */ - for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) =3D=3D 0) - continue; - ret =3D pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); - if (ret) - goto err_disable_device; - break; - } + ret =3D pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); + if (ret) + goto err_disable_device; =20 memset(&res, 0, sizeof(res)); res.addr =3D pcim_iomap_table(pdev)[0]; --=20 2.48.1 From nobody Thu Dec 18 07:32:04 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 EA0A32690C9; Thu, 13 Mar 2025 16:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882486; cv=none; b=QhdeMeEyvA6skdePNpygzP87u/oGzEB+xPSc7Sf4aABAkMQue+raWVfGD6GKLauX9tRaJ3xM2YPP8yG8B5o5sRVXoSNhusX+N7NPy//QMDldkbXAAho1WuUKj2atYprbjKBsBC61MVx+2QJ/J7FdK1iLLHAZlQEyg2SQf2r4zTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882486; c=relaxed/simple; bh=lIHNdIK6hPFeIvlmwhxstmnP1ls57wGiXfAx3JVAMPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GFFPUlp/PPMQOjiGWPEqI89Irb9t/xd0IY3zFH1pDiSUlsi2zjudQWUJ1MAE4Yf+gdkYqodtpTydGdMIslh5CCxWKYcyMjs0h2axRWwN8h+YsGZQItRyuMiZS9i7x+8DqYNlt6631Fq+ThGkjnyzaP5s221Vm0DZwFgrLI/NbZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QBzVQKD6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QBzVQKD6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 344ECC4CEEB; Thu, 13 Mar 2025 16:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882485; bh=lIHNdIK6hPFeIvlmwhxstmnP1ls57wGiXfAx3JVAMPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QBzVQKD6Svv3aG0hcCqbk3fiNaZGQyvt8d3RC0Q1h2bDF3ukGOcLHRbjpszA2HMJY xYCvzlubxxkJzthlxcAYaXFaBi429vOLx6+lkZotUBR0Jo2dl4L96LsmvkEh0bOcHd ditNl2D+0gqwRdtF6btsu11+kdTvr/HlnGhewLkOBYHPBCeH2oN2tIRtDORPG8a4NE sjbXXu5USkuTe9uEwlTNAq4q9nhsZRBxJ2hGdNUsdot9uirwktObCpW+/ZaabXKYAV HxaQ15diI4jWCcUhEAkKNaSygEXdWsRda2dFuiDYGkXlASesP1qFQzWKpawFUDrRL4 pKLeu/wbKDDbg== From: Philipp Stanner To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Yanteng Si , Huacai Chen , Yinggang Gu , Serge Semin , Philipp Stanner Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Philipp Stanner , Andrew Lunn , Henry Chen Subject: [PATCH net-next 2/3] stmmac: Remove pcim_* functions for driver detach Date: Thu, 13 Mar 2025 17:14:22 +0100 Message-ID: <20250313161422.97174-4-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313161422.97174-2-phasta@kernel.org> References: <20250313161422.97174-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Functions prefixed with "pcim_" are managed devres functions which perform automatic cleanup once the driver unloads. It is, thus, not necessary to call any cleanup functions in remove() callbacks. Remove the pcim_ cleanup function calls in the remove() callbacks. Signed-off-by: Philipp Stanner Reviewed-by: Andrew Lunn Reviewed-by: Yanteng Si Tested-by: Henry Chen Reviewed-by: Jacob Keller --- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 8 -------- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 12 +----------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-loongson.c index e2959ac5c1ca..5d7746d787ac 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -603,7 +603,6 @@ static void loongson_dwmac_remove(struct pci_dev *pdev) struct net_device *ndev =3D dev_get_drvdata(&pdev->dev); struct stmmac_priv *priv =3D netdev_priv(ndev); struct loongson_data *ld; - int i; =20 ld =3D priv->plat->bsp_priv; stmmac_dvr_remove(&pdev->dev); @@ -614,13 +613,6 @@ static void loongson_dwmac_remove(struct pci_dev *pdev) if (ld->loongson_id =3D=3D DWMAC_CORE_LS_MULTICHAN) loongson_dwmac_msi_clear(pdev); =20 - for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) =3D=3D 0) - continue; - pcim_iounmap_regions(pdev, BIT(i)); - break; - } - pci_disable_device(pdev); } =20 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net= /ethernet/stmicro/stmmac/stmmac_pci.c index 352b01678c22..1637c8139b9d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -226,21 +226,11 @@ static int stmmac_pci_probe(struct pci_dev *pdev, * stmmac_pci_remove * * @pdev: platform device pointer - * Description: this function calls the main to free the net resources - * and releases the PCI resources. + * Description: this function calls the main to free the net resources. */ static void stmmac_pci_remove(struct pci_dev *pdev) { - int i; - stmmac_dvr_remove(&pdev->dev); - - for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) =3D=3D 0) - continue; - pcim_iounmap_regions(pdev, BIT(i)); - break; - } } =20 static int __maybe_unused stmmac_pci_suspend(struct device *dev) --=20 2.48.1 From nobody Thu Dec 18 07:32:04 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8FD3226A0CC; Thu, 13 Mar 2025 16:14:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882490; cv=none; b=knJlTnMQd6EwDUWaekMdMrzhcoGBicLtd7CrYJHBA6cTUl5cMwo2IgLNx3Y6ulQ2KiA2/I2DxHoI6jTj1z4PmyMuJ+iQhQdNLmQ1hIG4kruhghLPkdNj56XMRf5zjkBTpPxN4agle7mXXrF3sonGcybCtHEfqCsv9orcWZh18Qg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882490; c=relaxed/simple; bh=Y8/MDMfs1bwprrJrMnPBGIZtYhcw/F6xhmmiWJV6T6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j2edEuezkQ2lelZtHhD0r1DEWQfcKvEQQn6aGuG8hxyk7k0vnNnd1t3C+7ZliWTdVfKr2iPZKXekesoOxKxOhT1BwBQZAXXdTuxls+j0nJrH6tq+C+YjQFWg5RvxZdZDkjFZg1rnnuOh6vIOtlbRjyf0qtFDPgDbOhS1fXvw3d4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uBas+Xyr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uBas+Xyr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E409AC4CEEE; Thu, 13 Mar 2025 16:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882490; bh=Y8/MDMfs1bwprrJrMnPBGIZtYhcw/F6xhmmiWJV6T6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uBas+XyrOTNPJWUphlmNLX688HmEaBK54fr41BRraE1SYejqEdjCHI5FyhBDUmbHS QEW7Zd152Yog4KahsAuOQr1/cObt7WrS8l+QlIP2V1EZ8PgzVej5M7qFkTnkb94yK0 FxGByoDLRv8wP3ZnFTGJ/Xci8ME6FV6zfuTOBs0nOmch9y/GSL5ERjZMrtYkmH2kqg MGSfQD0h2KDectZHJbrOfkdD63TvY280mDfoU+YACl7lUBWDlCVRuuxPkjyWVl3lso L/+e/MUGjZtiqIAE1ciFeA/Biayk2qyxOMHqxma08amizDszWbFq/04OUCKEUZt42w RrxdH/yMlOpKw== From: Philipp Stanner To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Yanteng Si , Huacai Chen , Yinggang Gu , Serge Semin , Philipp Stanner Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Lunn , Huacai Chen , Henry Chen Subject: [PATCH net-next 3/3] stmmac: Replace deprecated PCI functions Date: Thu, 13 Mar 2025 17:14:23 +0100 Message-ID: <20250313161422.97174-5-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313161422.97174-2-phasta@kernel.org> References: <20250313161422.97174-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Philipp Stanner The PCI functions - pcim_iomap_regions() and - pcim_iomap_table() have been deprecated. Replace them with their successor function, pcim_iomap_region(). Make variable declaration order at closeby places comply with reverse christmas tree order. Signed-off-by: Philipp Stanner Reviewed-by: Andrew Lunn Reviewed-by: Huacai Chen Tested-by: Henry Chen Reviewed-by: Jacob Keller --- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 8 +++----- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers= /net/ethernet/stmicro/stmmac/dwmac-loongson.c index 5d7746d787ac..25ef7b9c5dce 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -521,8 +521,8 @@ static int loongson_dwmac_acpi_config(struct pci_dev *p= dev, static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_dev= ice_id *id) { struct plat_stmmacenet_data *plat; + struct stmmac_resources res =3D {}; struct stmmac_pci_info *info; - struct stmmac_resources res; struct loongson_data *ld; int ret; =20 @@ -554,13 +554,11 @@ static int loongson_dwmac_probe(struct pci_dev *pdev,= const struct pci_device_id pci_set_master(pdev); =20 /* Get the base address of device */ - ret =3D pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); + res.addr =3D pcim_iomap_region(pdev, 0, DRIVER_NAME); + ret =3D PTR_ERR_OR_ZERO(res.addr); if (ret) goto err_disable_device; =20 - memset(&res, 0, sizeof(res)); - res.addr =3D pcim_iomap_table(pdev)[0]; - plat->bsp_priv =3D ld; plat->setup =3D loongson_dwmac_setup; ld->dev =3D &pdev->dev; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net= /ethernet/stmicro/stmmac/stmmac_pci.c index 1637c8139b9d..b7adda35b7b7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -155,9 +155,9 @@ static int stmmac_pci_probe(struct pci_dev *pdev, { struct stmmac_pci_info *info =3D (struct stmmac_pci_info *)id->driver_dat= a; struct plat_stmmacenet_data *plat; - struct stmmac_resources res; - int i; + struct stmmac_resources res =3D {}; int ret; + int i; =20 plat =3D devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL); if (!plat) @@ -188,13 +188,13 @@ static int stmmac_pci_probe(struct pci_dev *pdev, return ret; } =20 - /* Get the base address of device */ + /* The first BAR > 0 is the base IO addr of our device. */ for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { if (pci_resource_len(pdev, i) =3D=3D 0) continue; - ret =3D pcim_iomap_regions(pdev, BIT(i), pci_name(pdev)); - if (ret) - return ret; + res.addr =3D pcim_iomap_region(pdev, i, STMMAC_RESOURCE_NAME); + if (IS_ERR(res.addr)) + return PTR_ERR(res.addr); break; } =20 @@ -204,8 +204,6 @@ static int stmmac_pci_probe(struct pci_dev *pdev, if (ret) return ret; =20 - memset(&res, 0, sizeof(res)); - res.addr =3D pcim_iomap_table(pdev)[i]; res.wol_irq =3D pdev->irq; res.irq =3D pdev->irq; =20 --=20 2.48.1