leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qed: Replace set_id() api with set_name()

Browse Source 
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>
This commit is contained in:
Mintz, Yuval 2017-05-23 09:41:28 +03:00 committed by David S. Miller
parent 6bc9f234ff
commit 712c3cbf19
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/qlogic/qed/qed.h
View File

@ -638,7 +638,6 @@ struct qed_dev {
int pcie_width; int pcie_width;
int pcie_speed; int pcie_speed;
u8 ver_str[VER_SIZE];
/* Add MF related configuration */ /* Add MF related configuration */
u8 mcp_rev; u8 mcp_rev;

9
drivers/net/ethernet/qlogic/qed/qed_main.c
View File

@ -338,6 +338,7 @@ static struct qed_dev *qed_probe(struct pci_dev *pdev,
if (!cdev) if (!cdev)
goto err0; goto err0;
cdev->drv_type = DRV_ID_DRV_TYPE_LINUX;
cdev->protocol = params->protocol; cdev->protocol = params->protocol;
if (params->is_vf) if (params->is_vf)
@ -1128,17 +1129,13 @@ static int qed_slowpath_stop(struct qed_dev *cdev)
return 0; return 0;
} }
static void qed_set_id(struct qed_dev *cdev, char name[NAME_SIZE], static void qed_set_name(struct qed_dev *cdev, char name[NAME_SIZE])
char ver_str[VER_SIZE])
{ {
int i; int i;
memcpy(cdev->name, name, NAME_SIZE); memcpy(cdev->name, name, NAME_SIZE);
for_each_hwfn(cdev, i) for_each_hwfn(cdev, i)
snprintf(cdev->hwfns[i].name, NAME_SIZE, "%s-%d", name, 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, 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, .probe = &qed_probe,
.remove = &qed_remove, .remove = &qed_remove,
.set_power_state = &qed_set_power_state, .set_power_state = &qed_set_power_state,
.set_id = &qed_set_id, .set_name = &qed_set_name,
.update_pf_params = &qed_update_pf_params, .update_pf_params = &qed_update_pf_params,
.slowpath_start = &qed_slowpath_start, .slowpath_start = &qed_slowpath_start,
.slowpath_stop = &qed_slowpath_stop, .slowpath_stop = &qed_slowpath_stop,

4
drivers/net/ethernet/qlogic/qede/qede_main.c
View File

@ -259,7 +259,7 @@ static int qede_netdev_event(struct notifier_block *this, unsigned long event,
/* Notify qed of the name change */ /* Notify qed of the name change */
if (!edev->ops || !edev->ops->common) if (!edev->ops || !edev->ops->common)
goto done; goto done;
edev->ops->common->set_id(edev->cdev, edev->ndev->name, "qede"); edev->ops->common->set_name(edev->cdev, edev->ndev->name);
break; break;
case NETDEV_CHANGEADDR: case NETDEV_CHANGEADDR:
edev = netdev_priv(ndev); edev = netdev_priv(ndev);
@ -967,7 +967,7 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level,
goto err4; 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 */ /* PTP not supported on VFs */
if (!is_vf) if (!is_vf)

2
drivers/scsi/qedf/qedf_main.c
View File

@ -2954,7 +2954,7 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)
"WWPN=%016llx.\n", qedf->wwnn, qedf->wwpn); "WWPN=%016llx.\n", qedf->wwnn, qedf->wwpn);
sprintf(host_buf, "host_%d", host->host_no); 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 */ /* Set xid max values */

2
drivers/scsi/qedi/qedi_main.c
View File

@ -1843,7 +1843,7 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)
qedi->mac); qedi->mac);
sprintf(host_buf, "host_%d", qedi->shost->host_no); 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); qedi_ops->register_ops(qedi->cdev, &qedi_cb_ops, qedi);

4
include/linux/qed/qed_if.h
View File

@ -520,9 +520,7 @@ struct qed_common_ops {
int (*set_power_state)(struct qed_dev *cdev, int (*set_power_state)(struct qed_dev *cdev,
pci_power_t state); pci_power_t state);
void (*set_id)(struct qed_dev *cdev, void (*set_name) (struct qed_dev *cdev, char name[]);
char name[],
char ver_str[]);
/* Client drivers need to make this call before slowpath_start. /* Client drivers need to make this call before slowpath_start.
* PF params required for the call before slowpath_start is * PF params required for the call before slowpath_start is