Commit dd0bcc0b authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller

cxgb4/cxgb4vf: global named must be unique

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22f10923
...@@ -1007,7 +1007,7 @@ int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info, ...@@ -1007,7 +1007,7 @@ int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,
int t4_prep_adapter(struct adapter *adapter); int t4_prep_adapter(struct adapter *adapter);
enum t4_bar2_qtype { T4_BAR2_QTYPE_EGRESS, T4_BAR2_QTYPE_INGRESS }; enum t4_bar2_qtype { T4_BAR2_QTYPE_EGRESS, T4_BAR2_QTYPE_INGRESS };
int t4_bar2_sge_qregs(struct adapter *adapter, int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,
unsigned int qid, unsigned int qid,
enum t4_bar2_qtype qtype, enum t4_bar2_qtype qtype,
u64 *pbar2_qoffset, u64 *pbar2_qoffset,
......
...@@ -3815,7 +3815,7 @@ int cxgb4_bar2_sge_qregs(struct net_device *dev, ...@@ -3815,7 +3815,7 @@ int cxgb4_bar2_sge_qregs(struct net_device *dev,
u64 *pbar2_qoffset, u64 *pbar2_qoffset,
unsigned int *pbar2_qid) unsigned int *pbar2_qid)
{ {
return t4_bar2_sge_qregs(netdev2adap(dev), return cxgb4_t4_bar2_sge_qregs(netdev2adap(dev),
qid, qid,
(qtype == CXGB4_BAR2_QTYPE_EGRESS (qtype == CXGB4_BAR2_QTYPE_EGRESS
? T4_BAR2_QTYPE_EGRESS ? T4_BAR2_QTYPE_EGRESS
...@@ -4011,7 +4011,7 @@ static void process_db_drop(struct work_struct *work) ...@@ -4011,7 +4011,7 @@ static void process_db_drop(struct work_struct *work)
unsigned int bar2_qid; unsigned int bar2_qid;
int ret; int ret;
ret = t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS, ret = cxgb4_t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS,
&bar2_qoffset, &bar2_qid); &bar2_qoffset, &bar2_qid);
if (ret) if (ret)
dev_err(adap->pdev_dev, "doorbell drop recovery: " dev_err(adap->pdev_dev, "doorbell drop recovery: "
......
...@@ -2270,7 +2270,7 @@ static void __iomem *bar2_address(struct adapter *adapter, ...@@ -2270,7 +2270,7 @@ static void __iomem *bar2_address(struct adapter *adapter,
u64 bar2_qoffset; u64 bar2_qoffset;
int ret; int ret;
ret = t4_bar2_sge_qregs(adapter, qid, qtype, ret = cxgb4_t4_bar2_sge_qregs(adapter, qid, qtype,
&bar2_qoffset, pbar2_qid); &bar2_qoffset, pbar2_qid);
if (ret) if (ret)
return NULL; return NULL;
......
...@@ -4031,7 +4031,7 @@ int t4_prep_adapter(struct adapter *adapter) ...@@ -4031,7 +4031,7 @@ int t4_prep_adapter(struct adapter *adapter)
} }
/** /**
* t4_bar2_sge_qregs - return BAR2 SGE Queue register information * cxgb4_t4_bar2_sge_qregs - return BAR2 SGE Queue register information
* @adapter: the adapter * @adapter: the adapter
* @qid: the Queue ID * @qid: the Queue ID
* @qtype: the Ingress or Egress type for @qid * @qtype: the Ingress or Egress type for @qid
...@@ -4055,7 +4055,7 @@ int t4_prep_adapter(struct adapter *adapter) ...@@ -4055,7 +4055,7 @@ int t4_prep_adapter(struct adapter *adapter)
* Write Combining Doorbell Buffer. If the BAR2 Queue ID is not 0, * Write Combining Doorbell Buffer. If the BAR2 Queue ID is not 0,
* then these "Inferred Queue ID" register may not be used. * then these "Inferred Queue ID" register may not be used.
*/ */
int t4_bar2_sge_qregs(struct adapter *adapter, int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,
unsigned int qid, unsigned int qid,
enum t4_bar2_qtype qtype, enum t4_bar2_qtype qtype,
u64 *pbar2_qoffset, u64 *pbar2_qoffset,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment