diff options
Diffstat (limited to 'drivers/net/ehea/ehea_phyp.c')
-rw-r--r-- | drivers/net/ehea/ehea_phyp.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ehea/ehea_phyp.c index 8fe9dcaa7538..0506967b9044 100644 --- a/drivers/net/ehea/ehea_phyp.c +++ b/drivers/net/ehea/ehea_phyp.c | |||
@@ -26,6 +26,8 @@ | |||
26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
30 | |||
29 | #include "ehea_phyp.h" | 31 | #include "ehea_phyp.h" |
30 | 32 | ||
31 | 33 | ||
@@ -67,12 +69,11 @@ static long ehea_plpar_hcall_norets(unsigned long opcode, | |||
67 | } | 69 | } |
68 | 70 | ||
69 | if (ret < H_SUCCESS) | 71 | if (ret < H_SUCCESS) |
70 | ehea_error("opcode=%lx ret=%lx" | 72 | pr_err("opcode=%lx ret=%lx" |
71 | " arg1=%lx arg2=%lx arg3=%lx arg4=%lx" | 73 | " arg1=%lx arg2=%lx arg3=%lx arg4=%lx" |
72 | " arg5=%lx arg6=%lx arg7=%lx ", | 74 | " arg5=%lx arg6=%lx arg7=%lx\n", |
73 | opcode, ret, | 75 | opcode, ret, |
74 | arg1, arg2, arg3, arg4, arg5, | 76 | arg1, arg2, arg3, arg4, arg5, arg6, arg7); |
75 | arg6, arg7); | ||
76 | 77 | ||
77 | return ret; | 78 | return ret; |
78 | } | 79 | } |
@@ -114,19 +115,18 @@ static long ehea_plpar_hcall9(unsigned long opcode, | |||
114 | && (((cb_cat == H_PORT_CB4) && ((arg3 == H_PORT_CB4_JUMBO) | 115 | && (((cb_cat == H_PORT_CB4) && ((arg3 == H_PORT_CB4_JUMBO) |
115 | || (arg3 == H_PORT_CB4_SPEED))) || ((cb_cat == H_PORT_CB7) | 116 | || (arg3 == H_PORT_CB4_SPEED))) || ((cb_cat == H_PORT_CB7) |
116 | && (arg3 == H_PORT_CB7_DUCQPN))))) | 117 | && (arg3 == H_PORT_CB7_DUCQPN))))) |
117 | ehea_error("opcode=%lx ret=%lx" | 118 | pr_err("opcode=%lx ret=%lx" |
118 | " arg1=%lx arg2=%lx arg3=%lx arg4=%lx" | 119 | " arg1=%lx arg2=%lx arg3=%lx arg4=%lx" |
119 | " arg5=%lx arg6=%lx arg7=%lx arg8=%lx" | 120 | " arg5=%lx arg6=%lx arg7=%lx arg8=%lx" |
120 | " arg9=%lx" | 121 | " arg9=%lx" |
121 | " out1=%lx out2=%lx out3=%lx out4=%lx" | 122 | " out1=%lx out2=%lx out3=%lx out4=%lx" |
122 | " out5=%lx out6=%lx out7=%lx out8=%lx" | 123 | " out5=%lx out6=%lx out7=%lx out8=%lx" |
123 | " out9=%lx", | 124 | " out9=%lx\n", |
124 | opcode, ret, | 125 | opcode, ret, |
125 | arg1, arg2, arg3, arg4, arg5, | 126 | arg1, arg2, arg3, arg4, arg5, |
126 | arg6, arg7, arg8, arg9, | 127 | arg6, arg7, arg8, arg9, |
127 | outs[0], outs[1], outs[2], outs[3], | 128 | outs[0], outs[1], outs[2], outs[3], outs[4], |
128 | outs[4], outs[5], outs[6], outs[7], | 129 | outs[5], outs[6], outs[7], outs[8]); |
129 | outs[8]); | ||
130 | return ret; | 130 | return ret; |
131 | } | 131 | } |
132 | 132 | ||
@@ -515,7 +515,7 @@ u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle, | |||
515 | const u64 log_pageaddr, const u64 count) | 515 | const u64 log_pageaddr, const u64 count) |
516 | { | 516 | { |
517 | if ((count > 1) && (log_pageaddr & ~PAGE_MASK)) { | 517 | if ((count > 1) && (log_pageaddr & ~PAGE_MASK)) { |
518 | ehea_error("not on pageboundary"); | 518 | pr_err("not on pageboundary\n"); |
519 | return H_PARAMETER; | 519 | return H_PARAMETER; |
520 | } | 520 | } |
521 | 521 | ||