net: dsa: microchip: remove IS_9893 flag

Use chip_id as other places of this code do it

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 077b4e5..42d7e4c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1164,9 +1164,6 @@ int ksz9477_switch_init(struct ksz_device *dev)
        if (ret)
                return ret;
 
-       if (dev->chip_id == KSZ9893_CHIP_ID)
-               dev->features |= IS_9893;
-
        return 0;
 }
 

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 7eb74ab..37fb5ba 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -1912,7 +1912,8 @@ static void ksz_set_xmii(struct ksz_device *dev, int port,
        case PHY_INTERFACE_MODE_RGMII_RXID:
                data8 |= bitval[P_RGMII_SEL];
                /* On KSZ9893, disable RGMII in-band status support */
-               if (dev->features & IS_9893)
+               if (dev->chip_id == KSZ9893_CHIP_ID ||
+                   dev->chip_id == KSZ8563_CHIP_ID)
                        data8 &= ~P_MII_MAC_MODE;
                break;
        default:

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 4914cc1..c01989c 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -119,7 +119,6 @@ struct ksz_device {
        unsigned long mib_read_interval;
        u16 mirror_rx;
        u16 mirror_tx;
-       u32 features;                   /* chip specific features */
        u16 port_mask;
 };
 
@@ -542,9 +541,6 @@ static inline int is_lan937x(struct ksz_device *dev)
 
 #define SW_START                       0x01
 
-/* Used with variable features to indicate capabilities. */
-#define IS_9893                                BIT(2)
-
 /* xMII configuration */
 #define P_MII_DUPLEX_M                 BIT(6)
 #define P_MII_100MBIT_M                        BIT(4)