projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s390: Use pr_warn instead of pr_warning
[cascardo/linux.git]
/
arch
/
s390
/
mm
/
extmem.c
diff --git
a/arch/s390/mm/extmem.c
b/arch/s390/mm/extmem.c
index
a1bf4ad
..
02042b6
100644
(file)
--- a/
arch/s390/mm/extmem.c
+++ b/
arch/s390/mm/extmem.c
@@
-265,7
+265,7
@@
query_segment_type (struct dcss_segment *seg)
goto out_free;
}
if (diag_cc > 1) {
goto out_free;
}
if (diag_cc > 1) {
- pr_warn
ing
("Querying a DCSS type failed with rc=%ld\n", vmrc);
+ pr_warn("Querying a DCSS type failed with rc=%ld\n", vmrc);
rc = dcss_diag_translate_rc (vmrc);
goto out_free;
}
rc = dcss_diag_translate_rc (vmrc);
goto out_free;
}
@@
-457,8
+457,7
@@
__segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
goto out_resource;
}
if (diag_cc > 1) {
goto out_resource;
}
if (diag_cc > 1) {
- pr_warning("Loading DCSS %s failed with rc=%ld\n", name,
- end_addr);
+ pr_warn("Loading DCSS %s failed with rc=%ld\n", name, end_addr);
rc = dcss_diag_translate_rc(end_addr);
dcss_diag(&purgeseg_scode, seg->dcss_name,
&dummy, &dummy);
rc = dcss_diag_translate_rc(end_addr);
dcss_diag(&purgeseg_scode, seg->dcss_name,
&dummy, &dummy);
@@
-574,8
+573,7
@@
segment_modify_shared (char *name, int do_nonshared)
goto out_unlock;
}
if (atomic_read (&seg->ref_count) != 1) {
goto out_unlock;
}
if (atomic_read (&seg->ref_count) != 1) {
- pr_warning("DCSS %s is in use and cannot be reloaded\n",
- name);
+ pr_warn("DCSS %s is in use and cannot be reloaded\n", name);
rc = -EAGAIN;
goto out_unlock;
}
rc = -EAGAIN;
goto out_unlock;
}
@@
-588,8
+586,8
@@
segment_modify_shared (char *name, int do_nonshared)
seg->res->flags |= IORESOURCE_READONLY;
if (request_resource(&iomem_resource, seg->res)) {
seg->res->flags |= IORESOURCE_READONLY;
if (request_resource(&iomem_resource, seg->res)) {
- pr_warn
ing("DCSS %s overlaps with used memory resources "
-
"and cannot be reloaded\n",
name);
+ pr_warn
("DCSS %s overlaps with used memory resources and cannot be reloaded\n",
+ name);
rc = -EBUSY;
kfree(seg->res);
goto out_del_mem;
rc = -EBUSY;
kfree(seg->res);
goto out_del_mem;
@@
-607,8
+605,8
@@
segment_modify_shared (char *name, int do_nonshared)
goto out_del_res;
}
if (diag_cc > 1) {
goto out_del_res;
}
if (diag_cc > 1) {
- pr_warn
ing("Reloading DCSS %s failed with rc=%ld\n", name
,
-
end_addr);
+ pr_warn
("Reloading DCSS %s failed with rc=%ld\n"
,
+
name,
end_addr);
rc = dcss_diag_translate_rc(end_addr);
goto out_del_res;
}
rc = dcss_diag_translate_rc(end_addr);
goto out_del_res;
}