net: phy: fixed_phy: Remove unused seqcount

Commit bf7afb29d545 ("phy: improve safety of fixed-phy MII register
reading") protected the fixed PHY status with a sequence counter.

Two years later, commit d2b977939b18 ("net: phy: fixed-phy: remove
fixed_phy_update_state()") removed the sequence counter's write side
critical section -- neutralizing its read side retry loop.

Remove the unused seqcount.

Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index 4a3d34f40cb9f7844f3d05a767ff7deb43e9e540..c4641b1704d614862e0383d2f2186b318b57f875 100644 (file)
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/gpio/consumer.h>
-#include <linux/seqlock.h>
 #include <linux/idr.h>
 #include <linux/netdevice.h>
 #include <linux/linkmode.h>
@@ -34,7 +33,6 @@ struct fixed_mdio_bus {
 struct fixed_phy {
        int addr;
        struct phy_device *phydev;
-       seqcount_t seqcount;
        struct fixed_phy_status status;
        bool no_carrier;
        int (*link_update)(struct net_device *, struct fixed_phy_status *);
@@ -80,19 +78,17 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num)
        list_for_each_entry(fp, &fmb->phys, node) {
                if (fp->addr == phy_addr) {
                        struct fixed_phy_status state;
-                       int s;
-
-                       do {
-                               s = read_seqcount_begin(&fp->seqcount);
-                               fp->status.link = !fp->no_carrier;
-                               /* Issue callback if user registered it. */
-                               if (fp->link_update)
-                                       fp->link_update(fp->phydev->attached_dev,
-                                                       &fp->status);
-                               /* Check the GPIO for change in status */
-                               fixed_phy_update(fp);
-                               state = fp->status;
-                       } while (read_seqcount_retry(&fp->seqcount, s));
+
+                       fp->status.link = !fp->no_carrier;
+
+                       /* Issue callback if user registered it. */
+                       if (fp->link_update)
+                               fp->link_update(fp->phydev->attached_dev,
+                                               &fp->status);
+
+                       /* Check the GPIO for change in status */
+                       fixed_phy_update(fp);
+                       state = fp->status;
 
                        return swphy_read_reg(reg_num, &state);
                }
@@ -150,8 +146,6 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr,
        if (!fp)
                return -ENOMEM;
 
-       seqcount_init(&fp->seqcount);
-
        if (irq != PHY_POLL)
                fmb->mii_bus->irq[phy_addr] = irq;