xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cnic, bnx2x, bnx2: Simplify cnic probing.

Browse Source 
Instead of using symbol_get(), cnic can now directly call the cnic_probe
functions in struct bnx2x and struct bnx2.  symbol_get() is not reliable
as it fails when the module is still initializing.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan
2012-12-06 10:33:12 +00:00
committed by David S. Miller
parent 68c64d2034
commit 4bd9b0fffb
6 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/ethernet/broadcom/cnic.c
View File

@@ -40,6 +40,7 @@
#include <net/ip6_checksum.h>
#include <scsi/iscsi_if.h>
#define BCM_CNIC 1
#include "cnic_if.h"
#include "bnx2.h"
#include "bnx2x/bnx2x.h"
@@ -5449,14 +5450,12 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev)
struct pci_dev *pdev;
struct cnic_dev *cdev;
struct cnic_local *cp;
struct bnx2 *bp = netdev_priv(dev);
struct cnic_eth_dev *ethdev = NULL;
struct cnic_eth_dev *(*probe)(struct net_device *) = NULL;
probe = symbol_get(bnx2_cnic_probe);
if (probe) {
ethdev = (*probe)(dev);
symbol_put(bnx2_cnic_probe);
}
if (bp->cnic_probe)
ethdev = (bp->cnic_probe)(dev);
if (!ethdev)
return NULL;
@@ -5511,14 +5510,12 @@ static struct cnic_dev *init_bnx2x_cnic(struct net_device *dev)
struct pci_dev *pdev;
struct cnic_dev *cdev;
struct cnic_local *cp;
struct bnx2x *bp = netdev_priv(dev);
struct cnic_eth_dev *ethdev = NULL;
struct cnic_eth_dev *(*probe)(struct net_device *) = NULL;
probe = symbol_get(bnx2x_cnic_probe);
if (probe) {
ethdev = (*probe)(dev);
symbol_put(bnx2x_cnic_probe);
}
if (bp->cnic_probe)
ethdev = bp->cnic_probe(dev);
if (!ethdev)
return NULL;