hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Bhanu Gollapudi 2011-03-17 17:13:35 -07:00 committed by James Bottomley
parent 1294bfe609
commit c94460fd29
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View File

@ -1395,12 +1395,6 @@ static int bnx2fc_destroy(struct net_device *netdev)
rtnl_lock(); rtnl_lock();
mutex_lock(&bnx2fc_dev_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 */ /* obtain physical netdev */
if (netdev->priv_flags & IFF_802_1Q_VLAN) if (netdev->priv_flags & IFF_802_1Q_VLAN)
phys_dev = vlan_dev_real_dev(netdev); phys_dev = vlan_dev_real_dev(netdev);
@ -1768,11 +1762,6 @@ static int bnx2fc_disable(struct net_device *netdev)
mutex_lock(&bnx2fc_dev_lock); mutex_lock(&bnx2fc_dev_lock);
if (THIS_MODULE->state != MODULE_STATE_LIVE) {
rc = -ENODEV;
goto nodev;
}
/* obtain physical netdev */ /* obtain physical netdev */
if (netdev->priv_flags & IFF_802_1Q_VLAN) if (netdev->priv_flags & IFF_802_1Q_VLAN)
phys_dev = vlan_dev_real_dev(netdev); 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__); BNX2FC_MISC_DBG("Entered %s\n", __func__);
mutex_lock(&bnx2fc_dev_lock); mutex_lock(&bnx2fc_dev_lock);
if (THIS_MODULE->state != MODULE_STATE_LIVE) {
rc = -ENODEV;
goto nodev;
}
/* obtain physical netdev */ /* obtain physical netdev */
if (netdev->priv_flags & IFF_802_1Q_VLAN) if (netdev->priv_flags & IFF_802_1Q_VLAN)
phys_dev = vlan_dev_real_dev(netdev); 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); 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)) { if (!try_module_get(THIS_MODULE)) {
rc = -EINVAL; rc = -EINVAL;
goto mod_err; goto mod_err;