1 files changed, 17 insertions, 19 deletions

diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 6583b2d94f64..2e856e6710f7 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -3576,26 +3576,24 @@ bfa_fcport_cfg_speed(struct bfa_s *bfa, enum bfa_port_speed speed)
                 return BFA_STATUS_UNSUPP_SPEED;
         }
 
-        /* For Mezz card, port speed entered needs to be checked */
-        if (bfa_mfg_is_mezz(fcport->bfa->ioc.attr->card_type)) {
-                if (bfa_ioc_get_type(&fcport->bfa->ioc) == BFA_IOC_TYPE_FC) {
-                        /* For CT2, 1G is not supported */
-                        if ((speed == BFA_PORT_SPEED_1GBPS) &&
-                            (bfa_asic_id_ct2(bfa->ioc.pcidev.device_id)))
-                                return BFA_STATUS_UNSUPP_SPEED;
+        /* Port speed entered needs to be checked */
+        if (bfa_ioc_get_type(&fcport->bfa->ioc) == BFA_IOC_TYPE_FC) {
+                /* For CT2, 1G is not supported */
+                if ((speed == BFA_PORT_SPEED_1GBPS) &&
+                    (bfa_asic_id_ct2(bfa->ioc.pcidev.device_id)))
+                        return BFA_STATUS_UNSUPP_SPEED;
 
-                        /* Already checked for Auto Speed and Max Speed supp */
-                        if (!(speed == BFA_PORT_SPEED_1GBPS ||
-                              speed == BFA_PORT_SPEED_2GBPS ||
-                              speed == BFA_PORT_SPEED_4GBPS ||
-                              speed == BFA_PORT_SPEED_8GBPS ||
-                              speed == BFA_PORT_SPEED_16GBPS ||
-                              speed == BFA_PORT_SPEED_AUTO))
-                                return BFA_STATUS_UNSUPP_SPEED;
-                } else {
-                        if (speed != BFA_PORT_SPEED_10GBPS)
-                                return BFA_STATUS_UNSUPP_SPEED;
-                }
+                /* Already checked for Auto Speed and Max Speed supp */
+                if (!(speed == BFA_PORT_SPEED_1GBPS ||
+                      speed == BFA_PORT_SPEED_2GBPS ||
+                      speed == BFA_PORT_SPEED_4GBPS ||
+                      speed == BFA_PORT_SPEED_8GBPS ||
+                      speed == BFA_PORT_SPEED_16GBPS ||
+                      speed == BFA_PORT_SPEED_AUTO))
+                        return BFA_STATUS_UNSUPP_SPEED;
+        } else {
+                if (speed != BFA_PORT_SPEED_10GBPS)
+                        return BFA_STATUS_UNSUPP_SPEED;
         }
 
         fcport->cfg.speed = speed;