cnic, bnx2x, bnx2: Simplify cnic probing.

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>

1 files changed, 9 insertions, 12 deletions

diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index b8650939a4be..df8c30d1a52c 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -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;