summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2026-03-02 18:35:46 -0800
committerJakub Kicinski <kuba@kernel.org>2026-03-02 18:35:46 -0800
commitd03c9ae654dd2f18f99f0efd873b209cba723007 (patch)
tree76a2351694501955d07ea244546661721f094daf /include
parentdf548e627b8ce5d354b1b19060dfb52a32f27d83 (diff)
parent07a8531d44272a1b9fd646f5fc09fc397e5b8a65 (diff)
Merge branch 'net-stmmac-further-cleanups'
Russell King says: ==================== net: stmmac: further cleanups Yet another bunch of patches cleaning up the stmmac driver. We start off by cleaning up the formatting for stmmac_mac_finish(). Then remove a plat_dat->port_node which is redundant, followed by several descriptor methods that aren't called. We then remove useless dwmac4 interrupt definitions, and realise that v4.10 definitions are the same as v4.0, so get rid of those as well. We also remove the write-only priv->hw->xlgmac member. Next, we change priv->extend_desc and priv->chain_mode to be a boolean and document what each of these are doing. Also do the same for dma_cfg->fixed_burst and dma_cfg->mixed_burst. Then, move the initialisation of dma_cfg->atds into stmmac_hw_init() as this is where we have all the dependencies for this known, and simplify its initialisation. Also comment what this is doing. Finally, move the check that priv->plat->dma_cfg is present and the programmable burst limit is set into the driver probe rather than checking it each time we are just about to reset the dwmac core. It is unnecessary to keep checking this. This makes a platform glue driver fail early when it hasn't setup everything that's required rather than when attempting to bring the netdev up for the first time. ==================== Link: https://patch.msgid.link/aaFpZvuIzOLaNM0m@shell.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/stmmac.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index b96ae9dadfab..2fc169c7117e 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -97,8 +97,8 @@ struct stmmac_dma_cfg {
int txpbl;
int rxpbl;
bool pblx8;
- int fixed_burst;
- int mixed_burst;
+ bool fixed_burst;
+ bool mixed_burst;
bool aal;
bool eame;
bool multi_msi_en;
@@ -225,7 +225,6 @@ struct plat_stmmacenet_data {
phy_interface_t phy_interface;
struct stmmac_mdio_bus_data *mdio_bus_data;
struct device_node *phy_node;
- struct fwnode_handle *port_node;
struct device_node *mdio_node;
struct stmmac_dma_cfg *dma_cfg;
struct stmmac_safety_feature_cfg *safety_feat_cfg;