Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[karo-tx-linux.git] / drivers / staging / rdma / hfi1 / mad.c

diff --git a/drivers/staging/rdma/hfi1/mad.c b/drivers/staging/rdma/hfi1/mad.c
index 0ec748e7e7b649419732351fc2e61b7ba7813355..d1e7f4d7cf6fdf3fb32d699af45348201511b38d 100644 (file)
--- a/drivers/staging/rdma/hfi1/mad.c
+++ b/drivers/staging/rdma/hfi1/mad.c
@@ -2630,7 +2630,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp,
                return reply((struct ib_mad_hdr *)pmp);
        }
 
-       rsp = (struct _port_dctrs *)&req->port[0];
+       rsp = &req->port[0];
        memset(rsp, 0, sizeof(*rsp));
 
        rsp->port_number = port;
@@ -2839,7 +2839,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp,
                return reply((struct ib_mad_hdr *)pmp);
        }
 
-       rsp = (struct _port_ectrs *)&req->port[0];
+       rsp = &req->port[0];
 
        ibp = to_iport(ibdev, port_num);
        ppd = ppd_from_ibp(ibp);
@@ -2859,7 +2859,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp,
 
        rsp->uncorrectable_errors = tmp < 0x100 ? (tmp & 0xff) : 0xff;
 
-       vlinfo = (struct _vls_ectrs *)&rsp->vls[0];
+       vlinfo = &rsp->vls[0];
        vfi = 0;
        vl_select_mask = be32_to_cpu(req->vl_select_mask);
        for_each_set_bit(vl, (unsigned long *)&(vl_select_mask),
@@ -2976,7 +2976,7 @@ static int pma_get_opa_errorinfo(struct opa_pma_mad *pmp,
        u64 reg;
 
        req = (struct opa_port_error_info_msg *)pmp->data;
-       rsp = (struct _port_ei *)&req->port[0];
+       rsp = &req->port[0];
 
        num_ports = OPA_AM_NPORT(be32_to_cpu(pmp->mad_hdr.attr_mod));
        num_pslm = hweight64(be64_to_cpu(req->port_select_mask[3]));
@@ -3221,7 +3221,7 @@ static int pma_set_opa_errorinfo(struct opa_pma_mad *pmp,
        u32 error_info_select;
 
        req = (struct opa_port_error_info_msg *)pmp->data;
-       rsp = (struct _port_ei *)&req->port[0];
+       rsp = &req->port[0];
 
        num_ports = OPA_AM_NPORT(be32_to_cpu(pmp->mad_hdr.attr_mod));
        num_pslm = hweight64(be64_to_cpu(req->port_select_mask[3]));