qed: Replace set_id() api with set_name()

Current API between qed and protocol modules allows passing an
additional private string - but it doesn't get utilized by qed
anywhere.

Clarify the API by removing it and renaming it 'set_name'.

CC: Manish Rangankar <Manish.Rangankar@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 2eb6031f0df1fb5de5bc8a7f0b34e1c0bbf578f6..e0becec17b097d7a78ded087f80939e4f444b47e 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -638,7 +638,6 @@ struct qed_dev {
 
        int                             pcie_width;
        int                             pcie_speed;
-       u8                              ver_str[VER_SIZE];
 
        /* Add MF related configuration */
        u8                              mcp_rev;

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index b5313c561fa2582f858a590c01412f89077fb377..c5bb80b9afc1b878c56dcd6a89804fe9b5577850 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -338,6 +338,7 @@ static struct qed_dev *qed_probe(struct pci_dev *pdev,
        if (!cdev)
                goto err0;
 
+       cdev->drv_type = DRV_ID_DRV_TYPE_LINUX;
        cdev->protocol = params->protocol;
 
        if (params->is_vf)
@@ -1128,17 +1129,13 @@ static int qed_slowpath_stop(struct qed_dev *cdev)
        return 0;
 }
 
-static void qed_set_id(struct qed_dev *cdev, char name[NAME_SIZE],
-                      char ver_str[VER_SIZE])
+static void qed_set_name(struct qed_dev *cdev, char name[NAME_SIZE])
 {
        int i;
 
        memcpy(cdev->name, name, NAME_SIZE);
        for_each_hwfn(cdev, i)
                snprintf(cdev->hwfns[i].name, NAME_SIZE, "%s-%d", name, i);
-
-       memcpy(cdev->ver_str, ver_str, VER_SIZE);
-       cdev->drv_type = DRV_ID_DRV_TYPE_LINUX;
 }
 
 static u32 qed_sb_init(struct qed_dev *cdev,
@@ -1692,7 +1689,7 @@ const struct qed_common_ops qed_common_ops_pass = {
        .probe = &qed_probe,
        .remove = &qed_remove,
        .set_power_state = &qed_set_power_state,
-       .set_id = &qed_set_id,
+       .set_name = &qed_set_name,
        .update_pf_params = &qed_update_pf_params,
        .slowpath_start = &qed_slowpath_start,
        .slowpath_stop = &qed_slowpath_stop,

diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index d496ba70ddb82452020f407d09df7eff6cf52cbd..00c70625f8a4ab143717766dbb616c15a368abcc 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -259,7 +259,7 @@ static int qede_netdev_event(struct notifier_block *this, unsigned long event,
                /* Notify qed of the name change */
                if (!edev->ops || !edev->ops->common)
                        goto done;
-               edev->ops->common->set_id(edev->cdev, edev->ndev->name, "qede");
+               edev->ops->common->set_name(edev->cdev, edev->ndev->name);
                break;
        case NETDEV_CHANGEADDR:
                edev = netdev_priv(ndev);
@@ -967,7 +967,7 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level,
                goto err4;
        }
 
-       edev->ops->common->set_id(cdev, edev->ndev->name, DRV_MODULE_VERSION);
+       edev->ops->common->set_name(cdev, edev->ndev->name);
 
        /* PTP not supported on VFs */
        if (!is_vf)

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index a5c97342fd5d2bc5f9826d34974e8d7b7c285dd3..b97405ed6cae672909cfda542d571188a5ebeef9 100644 (file)
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -2954,7 +2954,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)
                   "WWPN=%016llx.\n", qedf->wwnn, qedf->wwpn);
 
        sprintf(host_buf, "host_%d", host->host_no);
-       qed_ops->common->set_id(qedf->cdev, host_buf, QEDF_VERSION);
+       qed_ops->common->set_name(qedf->cdev, host_buf);
 
 
        /* Set xid max values */

diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index 92775a8b74b1cdc068b8d8808b7bd9ccd5b212eb..073b3051bb8f1b4d5666ef55dc11b3d4cf1fdea3 100644 (file)
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -1843,7 +1843,7 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)
                  qedi->mac);
 
        sprintf(host_buf, "host_%d", qedi->shost->host_no);
-       qedi_ops->common->set_id(qedi->cdev, host_buf, QEDI_MODULE_VERSION);
+       qedi_ops->common->set_name(qedi->cdev, host_buf);
 
        qedi_ops->register_ops(qedi->cdev, &qedi_cb_ops, qedi);
 

diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
index b00e6753b4f406813b020c5579ab96d30ffec37d..73c46d6d5727e4e354124e1516e73c9b0be74c83 100644 (file)
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
@@ -520,9 +520,7 @@ struct qed_common_ops {
        int             (*set_power_state)(struct qed_dev *cdev,
                                           pci_power_t state);
 
-       void            (*set_id)(struct qed_dev *cdev,
-                                 char name[],
-                                 char ver_str[]);
+       void (*set_name) (struct qed_dev *cdev, char name[]);
 
        /* Client drivers need to make this call before slowpath_start.
         * PF params required for the call before slowpath_start is