Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c94460fd authored by Bhanu Gollapudi's avatar Bhanu Gollapudi Committed by James Bottomley
Browse files

[SCSI] bnx2fc: Remove unnecessary module state checks 

The check for module state MODULE_STATE_LIVE is no longer required for LLDs, as
libfcoe transport takes care of it. Reference:
http://marc.info/?l=linux-scsi&m=129989565903046&w=2



Signed-off-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 1294bfe6

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+0 −23
Original line number Diff line number Diff line
@@ -1395,12 +1395,6 @@ static int bnx2fc_destroy(struct net_device *netdev) 
	rtnl_lock();



	mutex_lock(&bnx2fc_dev_lock);

#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE

	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto netdev_err;

	}

#endif

	/* obtain physical netdev */

	if (netdev->priv_flags & IFF_802_1Q_VLAN)

		phys_dev = vlan_dev_real_dev(netdev);
@@ -1768,11 +1762,6 @@ static int bnx2fc_disable(struct net_device *netdev) 


	mutex_lock(&bnx2fc_dev_lock);



	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto nodev;

	}



	/* obtain physical netdev */

	if (netdev->priv_flags & IFF_802_1Q_VLAN)

		phys_dev = vlan_dev_real_dev(netdev);
@@ -1828,11 +1817,6 @@ static int bnx2fc_enable(struct net_device *netdev) 
	BNX2FC_MISC_DBG("Entered %s\n", __func__);

	mutex_lock(&bnx2fc_dev_lock);



	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto nodev;

	}



	/* obtain physical netdev */

	if (netdev->priv_flags & IFF_802_1Q_VLAN)

		phys_dev = vlan_dev_real_dev(netdev);
@@ -1899,13 +1883,6 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode) 


	mutex_lock(&bnx2fc_dev_lock);



#ifdef CONFIG_SCSI_BNX2X_FCOE_MODULE

	if (THIS_MODULE->state != MODULE_STATE_LIVE) {

		rc = -ENODEV;

		goto mod_err;

	}

#endif



	if (!try_module_get(THIS_MODULE)) {

		rc = -EINVAL;

		goto mod_err;