Re: [PATCH net-next v4 02/15] net: macb: unify device pointer naming convention

[Nicolai Buchwitz]

Hi Théo

On 17.7.2026 21:48, Théo Lebrun wrote:
> Here are all device pointer variable permutations inside MACB:
>
>    struct device *dev;
>    struct net_device *dev;
>    struct net_device *ndev;
>    struct net_device *netdev;
>    struct pci_dev *pdev;              // inside macb_pci.c
>    struct phy_device *phy;
>    struct phy_device *phydev;
>    struct platform_device *pdev;
>    struct platform_device *plat_dev;  // inside macb_pci.c
>
> Unify to this convention:
>
>    struct device *dev;
>    struct net_device *netdev;
>    struct pci_dev *pci;
>    struct phy_device *phydev;
>    struct platform_device *pdev;
>
> Ensure nothing slipped through using ctags tooling:
>
> ⟩ ctags -o - --kinds-c='{local}{member}{parameter}' \
>     --fields='{typeref}' drivers/net/ethernet/cadence/* | \
>   awk -F"\t" '
>     $NF~/struct:.*(device|dev) / {print $NF, $1}' | \
>   sort -u
> typeref:struct:device * dev
> typeref:struct:in_device * idev        // ignored
> typeref:struct:net_device * netdev
> typeref:struct:pci_dev * pci
> typeref:struct:phy_device * phydev
> typeref:struct:platform_device * pdev
>
> Reviewed-by: Conor Dooley <conor.dooley@xxxxxxxxxxxxx>
> Signed-off-by: Théo Lebrun <theo.lebrun@xxxxxxxxxxx>
> ---
>  drivers/net/ethernet/cadence/macb.h      |  20 +-
>  drivers/net/ethernet/cadence/macb_main.c | 636 
> ++++++++++++++++---------------
>  drivers/net/ethernet/cadence/macb_pci.c  |  46 +--
>  drivers/net/ethernet/cadence/macb_ptp.c  |  18 +-
>  4 files changed, 361 insertions(+), 359 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb.h 
> b/drivers/net/ethernet/cadence/macb.h
> index 2de56017ee0d..9857df5b57f0 100644
> --- a/drivers/net/ethernet/cadence/macb.h
> +++ b/drivers/net/ethernet/cadence/macb.h
> @@ -1207,11 +1207,11 @@ struct macb_or_gem_ops {
>
>  /* MACB-PTP interface: adapt to platform needs. */
>  struct macb_ptp_info {
> -	void (*ptp_init)(struct net_device *ndev);
> -	void (*ptp_remove)(struct net_device *ndev);
> +	void (*ptp_init)(struct net_device *netdev);
> +	void (*ptp_remove)(struct net_device *netdev);
>  	s32 (*get_ptp_max_adj)(void);
>  	unsigned int (*get_tsu_rate)(struct macb *bp);
> -	int (*get_ts_info)(struct net_device *dev,
> +	int (*get_ts_info)(struct net_device *netdev,
>  			   struct kernel_ethtool_ts_info *info);
>  	int (*get_hwtst)(struct net_device *netdev,
>  			 struct kernel_hwtstamp_config *tstamp_config);
> @@ -1326,7 +1326,7 @@ struct macb {
>  	struct clk		*tx_clk;
>  	struct clk		*rx_clk;
>  	struct clk		*tsu_clk;
> -	struct net_device	*dev;
> +	struct net_device	*netdev;

Looks like you have missed the one in macb_free(), from commit 
27f575836cfe ("net:
macb: drop in-flight Tx SKBs on close"):

	bp->dev->stats.tx_dropped += dropped;

This breaks the build until patch 7 rewrites thatline, which breaks 
bisection.

> [...]

Thanks,
Nicolai