1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c
index e6f9cdd94c7a..2d41d04fd959 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
@@ -396,7 +396,7 @@ u64 hipz_h_query_port(const struct ipz_adapter_handle adapter_handle,
                       struct hipz_query_port *query_port_response_block)
 {
         u64 ret;
-        u64 r_cb = virt_to_abs(query_port_response_block);
+        u64 r_cb = __pa(query_port_response_block);
 
         if (r_cb & (EHCA_PAGESIZE-1)) {
                 ehca_gen_err("response block not page aligned");
@@ -438,7 +438,7 @@ u64 hipz_h_modify_port(const struct ipz_adapter_handle adapter_handle,
 u64 hipz_h_query_hca(const struct ipz_adapter_handle adapter_handle,
                      struct hipz_query_hca *query_hca_rblock)
 {
-        u64 r_cb = virt_to_abs(query_hca_rblock);
+        u64 r_cb = __pa(query_hca_rblock);
 
         if (r_cb & (EHCA_PAGESIZE-1)) {
                 ehca_gen_err("response_block=%p not page aligned",
@@ -577,7 +577,7 @@ u64 hipz_h_modify_qp(const struct ipz_adapter_handle adapter_handle,
                                 adapter_handle.handle, /* r4 */
                                 qp_handle.handle,      /* r5 */
                                 update_mask,           /* r6 */
-                                virt_to_abs(mqpcb),    /* r7 */
+                                __pa(mqpcb),           /* r7 */
                                 0, 0, 0, 0, 0);
 
         if (ret == H_NOT_ENOUGH_RESOURCES)
@@ -595,7 +595,7 @@ u64 hipz_h_query_qp(const struct ipz_adapter_handle adapter_handle,
         return ehca_plpar_hcall_norets(H_QUERY_QP,
                                        adapter_handle.handle, /* r4 */
                                        qp_handle.handle,      /* r5 */
-                                       virt_to_abs(qqpcb),    /* r6 */
+                                       __pa(qqpcb),           /* r6 */
                                        0, 0, 0, 0);
 }
 
@@ -787,7 +787,7 @@ u64 hipz_h_register_rpage_mr(const struct ipz_adapter_handle adapter_handle,
                 if (count > 1) {
                         u64 *kpage;
                         int i;
-                        kpage = (u64 *)abs_to_virt(logical_address_of_page);
+                        kpage = __va(logical_address_of_page);
                         for (i = 0; i < count; i++)
                                 ehca_gen_dbg("kpage[%d]=%p",
                                              i, (void *)kpage[i]);
@@ -944,7 +944,7 @@ u64 hipz_h_error_data(const struct ipz_adapter_handle adapter_handle,
                       void *rblock,
                       unsigned long *byte_count)
 {
-        u64 r_cb = virt_to_abs(rblock);
+        u64 r_cb = __pa(rblock);
 
         if (r_cb & (EHCA_PAGESIZE-1)) {
                 ehca_gen_err("rblock not page aligned.");