]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: ethernet: fs_enet: drop the .adjust_link custom fs_ops
authorMaxime Chevallier <maxime.chevallier@bootlin.com>
Wed, 4 Sep 2024 17:18:16 +0000 (19:18 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Sep 2024 09:29:04 +0000 (10:29 +0100)
There's no in-tree user for the fs_ops .adjust_link() function, so we
can always use the generic one in fe_enet-main.

Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
drivers/net/ethernet/freescale/fs_enet/fs_enet.h

index 2b48a2a5e32d4e70dde2e3c967e0c794fce04934..caca81b3ccb638eaad3ce3794c2660f06f5bafc0 100644 (file)
@@ -649,12 +649,7 @@ static void fs_adjust_link(struct net_device *dev)
        unsigned long flags;
 
        spin_lock_irqsave(&fep->lock, flags);
-
-       if (fep->ops->adjust_link)
-               fep->ops->adjust_link(dev);
-       else
-               generic_adjust_link(dev);
-
+       generic_adjust_link(dev);
        spin_unlock_irqrestore(&fep->lock, flags);
 }
 
index 21c07ac05225ffd52831cfc7667bf7a6d8013740..abe4dc97e52a5f83a8df96c6912a3267fe2767a8 100644 (file)
@@ -77,7 +77,6 @@ struct fs_ops {
        void (*free_bd)(struct net_device *dev);
        void (*cleanup_data)(struct net_device *dev);
        void (*set_multicast_list)(struct net_device *dev);
-       void (*adjust_link)(struct net_device *dev);
        void (*restart)(struct net_device *dev);
        void (*stop)(struct net_device *dev);
        void (*napi_clear_event)(struct net_device *dev);