From: Philipp Stanner <phasta@kernel.org>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Huacai Chen <chenhuacai@kernel.org>,
Yanteng Si <si.yanteng@linux.dev>,
Yinggang Gu <guyinggang@loongson.cn>,
Feiyang Chen <chenfeiyang@loongson.cn>,
Philipp Stanner <pstanner@redhat.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Qing Zhang <zhangqing@loongson.cn>
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 <phasta@kernel.org>
Subject: [PATCH net-next v3 3/4] stmmac: Remove pcim_* functions for driver detach
Date: Mon, 24 Feb 2025 14:53:21 +0100 [thread overview]
Message-ID: <20250224135321.36603-5-phasta@kernel.org> (raw)
In-Reply-To: <20250224135321.36603-2-phasta@kernel.org>
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 <phasta@kernel.org>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 7 -------
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 10 ----------
2 files changed, 17 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index e3cacd085b3f..f3ea6016be68 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -614,13 +614,6 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)
if (ld->loongson_id == DWMAC_CORE_LS_MULTICHAN)
loongson_dwmac_msi_clear(pdev);
- for (i = 0; i < PCI_STD_NUM_BARS; i++) {
- if (pci_resource_len(pdev, i) == 0)
- continue;
- pcim_iounmap_regions(pdev, BIT(i));
- break;
- }
-
pci_disable_device(pdev);
}
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 352b01678c22..91ff6c15f977 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -227,20 +227,10 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
*
* @pdev: platform device pointer
* Description: this function calls the main to free the net resources
- * and releases the PCI resources.
*/
static void stmmac_pci_remove(struct pci_dev *pdev)
{
- int i;
-
stmmac_dvr_remove(&pdev->dev);
-
- for (i = 0; i < PCI_STD_NUM_BARS; i++) {
- if (pci_resource_len(pdev, i) == 0)
- continue;
- pcim_iounmap_regions(pdev, BIT(i));
- break;
- }
}
static int __maybe_unused stmmac_pci_suspend(struct device *dev)
--
2.48.1
next prev parent reply other threads:[~2025-02-24 14:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 13:53 [PATCH net-next v3 0/4] stmmac: Several PCI-related improvements Philipp Stanner
2025-02-24 13:53 ` [PATCH net-next v3 1/4] stmmac: loongson: Pass correct arg to PCI function Philipp Stanner
2025-02-24 19:55 ` Andrew Lunn
2025-02-25 9:00 ` Yanteng Si
2025-02-24 13:53 ` [PATCH net-next v3 2/4] stmmac: loongson: Remove surplus loop Philipp Stanner
2025-02-24 19:55 ` Andrew Lunn
2025-02-25 9:06 ` Yanteng Si
2025-02-25 9:15 ` Philipp Stanner
2025-02-26 1:57 ` Yanteng Si
2025-02-25 9:29 ` Huacai Chen
2025-02-24 13:53 ` Philipp Stanner [this message]
2025-02-24 19:56 ` [PATCH net-next v3 3/4] stmmac: Remove pcim_* functions for driver detach Andrew Lunn
2025-02-25 9:10 ` Yanteng Si
2025-02-25 9:19 ` Huacai Chen
2025-02-24 13:53 ` [PATCH net-next v3 4/4] stmmac: Replace deprecated PCI functions Philipp Stanner
2025-02-24 19:57 ` Andrew Lunn
2025-02-25 7:16 ` Philipp Stanner
2025-02-25 9:14 ` Yanteng Si
2025-02-25 9:30 ` Huacai Chen
2025-02-25 8:42 ` [PATCH net-next v3 0/4] stmmac: Several PCI-related improvements Henry Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250224135321.36603-5-phasta@kernel.org \
--to=phasta@kernel.org \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=chenfeiyang@loongson.cn \
--cc=chenhuacai@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=guyinggang@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pstanner@redhat.com \
--cc=si.yanteng@linux.dev \
--cc=zhangqing@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.