qed: Remove BB_A0 references
authorMintz, Yuval <Yuval.Mintz@cavium.com>
Tue, 23 May 2017 06:41:23 +0000 (09:41 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 May 2017 19:17:19 +0000 (15:17 -0400)
A0 never went public, so no need to protect against it.

Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qlogic/qed/qed.h
drivers/net/ethernet/qlogic/qed/qed_dev.c

index 63c44c60eef3d099dd5e5f870babca6633530018..2eb6031f0df1fb5de5bc8a7f0b34e1c0bbf578f6 100644 (file)
@@ -598,16 +598,11 @@ struct qed_dev {
        enum    qed_dev_type type;
 /* Translate type/revision combo into the proper conditions */
 #define QED_IS_BB(dev)  ((dev)->type == QED_DEV_TYPE_BB)
-#define QED_IS_BB_A0(dev)       (QED_IS_BB(dev) && \
-                                CHIP_REV_IS_A0(dev))
 #define QED_IS_BB_B0(dev)       (QED_IS_BB(dev) && \
                                 CHIP_REV_IS_B0(dev))
 #define QED_IS_AH(dev)  ((dev)->type == QED_DEV_TYPE_AH)
 #define QED_IS_K2(dev)  QED_IS_AH(dev)
 
-#define QED_GET_TYPE(dev)       (QED_IS_BB_A0(dev) ? CHIP_BB_A0 : \
-                                QED_IS_BB_B0(dev) ? CHIP_BB_B0 : CHIP_K2)
-
        u16     vendor_id;
        u16     device_id;
 #define QED_DEV_ID_MASK                0xff00
@@ -621,7 +616,6 @@ struct qed_dev {
        u16     chip_rev;
 #define CHIP_REV_MASK                   0xf
 #define CHIP_REV_SHIFT                  12
-#define CHIP_REV_IS_A0(_cdev)   (!(_cdev)->chip_rev)
 #define CHIP_REV_IS_B0(_cdev)   ((_cdev)->chip_rev == 1)
 
        u16                             chip_metal;
index 51ae9071f3dfc09de1e70210dbd9771d133cb68f..3262aaa85b9abf32cd78d19b43dc6c7c33040b5a 100644 (file)
@@ -2812,12 +2812,6 @@ static int qed_get_dev_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
                cdev->chip_num, cdev->chip_rev,
                cdev->chip_bond_id, cdev->chip_metal);
 
-       if (QED_IS_BB(cdev) && CHIP_REV_IS_A0(cdev)) {
-               DP_NOTICE(cdev->hwfns,
-                         "The chip type/rev (BB A0) is not supported!\n");
-               return -EINVAL;
-       }
-
        return 0;
 }