2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c
index bb17cce3cb59..f5c45b194f53 100644
--- a/drivers/infiniband/hw/amso1100/c2_cq.c
+++ b/drivers/infiniband/hw/amso1100/c2_cq.c
@@ -133,7 +133,7 @@ static inline int c2_poll_one(struct c2_dev *c2dev,
         struct c2_qp *qp;
         int is_recv = 0;
 
-        ce = (struct c2wr_ce *) c2_mq_consume(&cq->mq);
+        ce = c2_mq_consume(&cq->mq);
         if (!ce) {
                 return -EAGAIN;
         }
@@ -146,7 +146,7 @@ static inline int c2_poll_one(struct c2_dev *c2dev,
         while ((qp =
                 (struct c2_qp *) (unsigned long) ce->qp_user_context) == NULL) {
                 c2_mq_free(&cq->mq);
-                ce = (struct c2wr_ce *) c2_mq_consume(&cq->mq);
+                ce = c2_mq_consume(&cq->mq);
                 if (!ce)
                         return -EAGAIN;
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 99bcbd7ffb0a..4b89b791be6a 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -479,13 +479,13 @@ void ehca_tasklet_neq(unsigned long data)
         struct ehca_eqe *eqe;
         u64 ret;
 
-        eqe = (struct ehca_eqe *)ehca_poll_eq(shca, &shca->neq);
+        eqe = ehca_poll_eq(shca, &shca->neq);
 
         while (eqe) {
                 if (!EHCA_BMASK_GET(NEQE_COMPLETION_EVENT, eqe->entry))
                         parse_ec(shca, eqe->entry);
 
-                eqe = (struct ehca_eqe *)ehca_poll_eq(shca, &shca->neq);
+                eqe = ehca_poll_eq(shca, &shca->neq);
         }
 
         ret = hipz_h_reset_event(shca->ipz_hca_handle,
@@ -572,8 +572,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
         eqe_cnt = 0;
         do {
                 u32 token;
-                eqe_cache[eqe_cnt].eqe =
-                        (struct ehca_eqe *)ehca_poll_eq(shca, eq);
+                eqe_cache[eqe_cnt].eqe = ehca_poll_eq(shca, eq);
                 if (!eqe_cache[eqe_cnt].eqe)
                         break;
                 eqe_value = eqe_cache[eqe_cnt].eqe->entry;
@@ -637,7 +636,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
                 goto unlock_irq_spinlock;
         do {
                 struct ehca_eqe *eqe;
-                eqe = (struct ehca_eqe *)ehca_poll_eq(shca, &shca->eq);
+                eqe = ehca_poll_eq(shca, &shca->eq);
                 if (!eqe)
                         break;
                 process_eqe(shca, eqe);