Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 712c3cbf authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller
Browse files

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: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bc9f234

drivers/net/ethernet/qlogic/qed/qed.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/qlogic/qed/qed_main.c

+3 −6
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/qlogic/qede/qede_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/qedf/qedf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/qedi/qedi_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);