diff options
author | Sathya Perla <sathyap@serverengines.com> | 2009-07-27 18:52:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-02 02:06:26 -0400 |
commit | eec368fb3ce3ee9e7bb042bbafb03f297d96e55e (patch) | |
tree | 1aa525ff817ea1cbcc6c95bc5beb1d01d38b1e26 /drivers/net/benet/be_cmds.c | |
parent | 8788fdc2a53cf012a43808877eaa6ac7e3c923b4 (diff) |
be2net: remove pci_func field from be_adapter struct
pci function is available as PCI_FUNC(pdev->devfn); no need for a
separate field.
Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet/be_cmds.c')
-rw-r--r-- | drivers/net/benet/be_cmds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 20278b9d5edb..daa2fe82b64a 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c | |||
@@ -388,7 +388,7 @@ int be_cmd_eq_create(struct be_adapter *adapter, | |||
388 | req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size)); | 388 | req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size)); |
389 | 389 | ||
390 | AMAP_SET_BITS(struct amap_eq_context, func, req->context, | 390 | AMAP_SET_BITS(struct amap_eq_context, func, req->context, |
391 | adapter->pci_func); | 391 | be_pci_func(adapter)); |
392 | AMAP_SET_BITS(struct amap_eq_context, valid, req->context, 1); | 392 | AMAP_SET_BITS(struct amap_eq_context, valid, req->context, 1); |
393 | /* 4byte eqe*/ | 393 | /* 4byte eqe*/ |
394 | AMAP_SET_BITS(struct amap_eq_context, size, req->context, 0); | 394 | AMAP_SET_BITS(struct amap_eq_context, size, req->context, 0); |
@@ -522,7 +522,7 @@ int be_cmd_cq_create(struct be_adapter *adapter, | |||
522 | AMAP_SET_BITS(struct amap_cq_context, eventable, ctxt, 1); | 522 | AMAP_SET_BITS(struct amap_cq_context, eventable, ctxt, 1); |
523 | AMAP_SET_BITS(struct amap_cq_context, eqid, ctxt, eq->id); | 523 | AMAP_SET_BITS(struct amap_cq_context, eqid, ctxt, eq->id); |
524 | AMAP_SET_BITS(struct amap_cq_context, armed, ctxt, 1); | 524 | AMAP_SET_BITS(struct amap_cq_context, armed, ctxt, 1); |
525 | AMAP_SET_BITS(struct amap_cq_context, func, ctxt, adapter->pci_func); | 525 | AMAP_SET_BITS(struct amap_cq_context, func, ctxt, be_pci_func(adapter)); |
526 | be_dws_cpu_to_le(ctxt, sizeof(req->context)); | 526 | be_dws_cpu_to_le(ctxt, sizeof(req->context)); |
527 | 527 | ||
528 | be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem); | 528 | be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem); |
@@ -565,7 +565,7 @@ int be_cmd_mccq_create(struct be_adapter *adapter, | |||
565 | 565 | ||
566 | req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); | 566 | req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); |
567 | 567 | ||
568 | AMAP_SET_BITS(struct amap_mcc_context, fid, ctxt, adapter->pci_func); | 568 | AMAP_SET_BITS(struct amap_mcc_context, fid, ctxt, be_pci_func(adapter)); |
569 | AMAP_SET_BITS(struct amap_mcc_context, valid, ctxt, 1); | 569 | AMAP_SET_BITS(struct amap_mcc_context, valid, ctxt, 1); |
570 | AMAP_SET_BITS(struct amap_mcc_context, ring_size, ctxt, | 570 | AMAP_SET_BITS(struct amap_mcc_context, ring_size, ctxt, |
571 | be_encoded_q_len(mccq->len)); | 571 | be_encoded_q_len(mccq->len)); |
@@ -614,7 +614,7 @@ int be_cmd_txq_create(struct be_adapter *adapter, | |||
614 | len_encoded = 0; | 614 | len_encoded = 0; |
615 | AMAP_SET_BITS(struct amap_tx_context, tx_ring_size, ctxt, len_encoded); | 615 | AMAP_SET_BITS(struct amap_tx_context, tx_ring_size, ctxt, len_encoded); |
616 | AMAP_SET_BITS(struct amap_tx_context, pci_func_id, ctxt, | 616 | AMAP_SET_BITS(struct amap_tx_context, pci_func_id, ctxt, |
617 | adapter->pci_func); | 617 | be_pci_func(adapter)); |
618 | AMAP_SET_BITS(struct amap_tx_context, ctx_valid, ctxt, 1); | 618 | AMAP_SET_BITS(struct amap_tx_context, ctx_valid, ctxt, 1); |
619 | AMAP_SET_BITS(struct amap_tx_context, cq_id_send, ctxt, cq->id); | 619 | AMAP_SET_BITS(struct amap_tx_context, cq_id_send, ctxt, cq->id); |
620 | 620 | ||