mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 16:01:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: stmmac: avoid passing pci_dev

Browse Source 
The pci_dev is only used to provide the ethtool bus_info using
pci_name(priv->plat->pdev). This is the same as dev_name(priv->device).
Thus, rather than passing the pci_dev, make use of what we already
have.

To avoid unexpectedly exposing the device name through ethtool where
it wasn't provided before, add a flag priv->plat->provide_bus_info
to enable this, which only dwmac-intel needs to set.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/E1w0evI-0000000CzY7-1fyo@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle)
2026-03-12 12:13:52 +00:00
committed by Jakub Kicinski
parent f4ce4922df
commit f807b5b9b8
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
View File

@@ -589,7 +589,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
int ret;
int i;
plat->pdev = pdev;
plat->provide_bus_info = true;
plat->phy_addr = -1;
plat->clk_csr = STMMAC_CSR_250_300M;
plat->core_type = DWMAC_CORE_GMAC4;

5
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
View File

@@ -312,10 +312,9 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev,
strscpy(info->driver, MAC100_ETHTOOL_NAME,
sizeof(info->driver));
if (priv->plat->pdev) {
strscpy(info->bus_info, pci_name(priv->plat->pdev),
if (priv->plat->provide_bus_info)
strscpy(info->bus_info, dev_name(priv->device),
sizeof(info->bus_info));
}
}
static int stmmac_ethtool_get_link_ksettings(struct net_device *dev,

2
include/linux/stmmac.h
View File

@@ -348,7 +348,7 @@ struct plat_stmmacenet_data {
int rss_en;
int mac_port_sel_speed;
u8 vlan_fail_q;
struct pci_dev *pdev;
bool provide_bus_info;
int int_snapshot_num;
int msi_mac_vec;
int msi_wol_vec;