IB/hfi1: Remove unused elements from struct ahg_ib_header

sde and hfi1_ib_header are not used anymore.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Dean Luick <dean.luick@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/ruc.c b/drivers/infiniband/hw/hfi1/ruc.c
index 7e76d33a577410094e3cf0077dd8d72bed48f5ed..c7c2f48ad8a895de71f5b1e44e69c0b8e03f5623 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ruc.c
+++ b/drivers/infiniband/hw/hfi1/ruc.c
@@ -735,7 +735,6 @@ static inline void build_ahg(struct rvt_qp *qp, u32 npsn)
                        qp->s_ahgpsn = npsn;
                        priv->s_hdr->tx_flags |= SDMA_TXREQ_F_AHG_COPY;
                        /* save to protect a change in another thread */
-                       priv->s_hdr->sde = priv->s_sde;
                        priv->s_hdr->ahgidx = qp->s_ahgidx;
                        qp->s_flags |= RVT_S_AHG_VALID;
                }
@@ -804,7 +803,6 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct hfi1_other_headers *ohdr,
        priv->s_hdr->tx_flags = 0;
        priv->s_hdr->ahgcount = 0;
        priv->s_hdr->ahgidx = 0;
-       priv->s_hdr->sde = NULL;
        if (qp->s_mig_state == IB_MIG_MIGRATED)
                bth0 |= IB_BTH_MIG_REQ;
        else

diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
index 02488c6fab285c6fd1373544d073a961881c8472..d4afb1dfda271dff4f9baa23195550f702773423 100644 (file)
--- a/drivers/infiniband/hw/hfi1/ud.c
+++ b/drivers/infiniband/hw/hfi1/ud.c
@@ -433,7 +433,6 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
        priv->s_hdr->ahgcount = 0;
        priv->s_hdr->ahgidx = 0;
        priv->s_hdr->tx_flags = 0;
-       priv->s_hdr->sde = NULL;
        /* pbc */
        ps->s_txreq->hdr_dwords = qp->s_hdrwords + 2;
 

diff --git a/drivers/infiniband/hw/hfi1/verbs.h b/drivers/infiniband/hw/hfi1/verbs.h
index 488356775627809599b6b7702b86d56ef396a2a9..4bd1cd42e981796d1a04c7bb2036cc743b260bd6 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.h
+++ b/drivers/infiniband/hw/hfi1/verbs.h
@@ -179,12 +179,10 @@ struct hfi1_ib_header {
 } __packed;
 
 struct ahg_ib_header {
-       struct sdma_engine *sde;
        u32 ahgdesc[2];
        u16 tx_flags;
        u8 ahgcount;
        u8 ahgidx;
-       struct hfi1_ib_header ibh;
 };
 
 struct hfi1_pio_header {