cxgb4: remove the name field from the adapter structure

Remove a field the driver uses to keep track of the name of the first
netdev it manages to register.  Do this by changing the registration
loop to stop the first time it fails so the first registered device is
trivial to tell.

Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/cxgb4/cxgb4.h
index f3d9f64188ffbe9a6a7baa14cf3d45220df3d116..9caf95f086e0c7731fa46e9820db4ad700b617aa 100644 (file)
--- a/drivers/net/cxgb4/cxgb4.h
+++ b/drivers/net/cxgb4/cxgb4.h
@@ -486,7 +486,6 @@ struct adapter {
        unsigned int fn;
        unsigned int flags;
 
-       const char *name;
        int msg_enable;
 
        struct adapter_params params;

diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 7e26fe5efbbf2d7c290d2d47353f399d2b08fb1d..4d7565cf74eed4602ffa0b9ad87be6bb5fb882b8 100644 (file)
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -525,10 +525,11 @@ static void name_msix_vecs(struct adapter *adap)
        int i, j, msi_idx = 2, n = sizeof(adap->msix_info[0].desc);
 
        /* non-data interrupts */
-       snprintf(adap->msix_info[0].desc, n, "%s", adap->name);
+       snprintf(adap->msix_info[0].desc, n, "%s", adap->port[0]->name);
 
        /* FW events */
-       snprintf(adap->msix_info[1].desc, n, "%s-FWeventq", adap->name);
+       snprintf(adap->msix_info[1].desc, n, "%s-FWeventq",
+                adap->port[0]->name);
 
        /* Ethernet queues */
        for_each_port(adap, j) {
@@ -543,11 +544,11 @@ static void name_msix_vecs(struct adapter *adap)
        /* offload queues */
        for_each_ofldrxq(&adap->sge, i)
                snprintf(adap->msix_info[msi_idx++].desc, n, "%s-ofld%d",
-                        adap->name, i);
+                        adap->port[0]->name, i);
 
        for_each_rdmarxq(&adap->sge, i)
                snprintf(adap->msix_info[msi_idx++].desc, n, "%s-rdma%d",
-                        adap->name, i);
+                        adap->port[0]->name, i);
 }
 
 static int request_msix_queue_irqs(struct adapter *adap)
@@ -2664,7 +2665,7 @@ static int cxgb_up(struct adapter *adap)
        } else {
                err = request_irq(adap->pdev->irq, t4_intr_handler(adap),
                                  (adap->flags & USING_MSI) ? 0 : IRQF_SHARED,
-                                 adap->name, adap);
+                                 adap->port[0]->name, adap);
                if (err)
                        goto irq_err;
        }
@@ -3627,7 +3628,6 @@ static int __devinit init_one(struct pci_dev *pdev,
        adapter->pdev = pdev;
        adapter->pdev_dev = &pdev->dev;
        adapter->fn = func;
-       adapter->name = pci_name(pdev);
        adapter->msg_enable = dflt_msg_enable;
        memset(adapter->chan_map, 0xff, sizeof(adapter->chan_map));
 
@@ -3724,26 +3724,19 @@ static int __devinit init_one(struct pci_dev *pdev,
 
                err = register_netdev(adapter->port[i]);
                if (err)
-                       dev_warn(&pdev->dev,
-                                "cannot register net device %s, skipping\n",
-                                adapter->port[i]->name);
-               else {
-                       /*
-                        * Change the name we use for messages to the name of
-                        * the first successfully registered interface.
-                        */
-                       if (!adapter->registered_device_map)
-                               adapter->name = adapter->port[i]->name;
-
-                       __set_bit(i, &adapter->registered_device_map);
-                       adapter->chan_map[pi->tx_chan] = i;
-                       print_port_info(adapter->port[i]);
-               }
+                       break;
+               __set_bit(i, &adapter->registered_device_map);
+               adapter->chan_map[pi->tx_chan] = i;
+               print_port_info(adapter->port[i]);
        }
-       if (!adapter->registered_device_map) {
+       if (i == 0) {
                dev_err(&pdev->dev, "could not register any net devices\n");
                goto out_free_dev;
        }
+       if (err) {
+               dev_warn(&pdev->dev, "only %d net devices registered\n", i);
+               err = 0;
+       };
 
        if (cxgb4_debugfs_root) {
                adapter->debugfs_root = debugfs_create_dir(pci_name(pdev),