Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / tile / kernel / module.c

diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c
index d19b13e..96447c9 100644 (file)
--- a/arch/tile/kernel/module.c
+++ b/arch/tile/kernel/module.c
@@ -96,8 +96,8 @@ void module_free(struct module *mod, void *module_region)
 static int validate_hw2_last(long value, struct module *me)
 {
        if (((value << 16) >> 16) != value) {
-               pr_warning("module %s: Out of range HW2_LAST value %#lx\n",
-                          me->name, value);
+               pr_warn("module %s: Out of range HW2_LAST value %#lx\n",
+                       me->name, value);
                return 0;
        }
        return 1;
@@ -210,10 +210,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
                        value -= (unsigned long) location;  /* pc-relative */
                        value = (long) value >> 3;     /* count by instrs */
                        if (!validate_jumpoff(value)) {
-                               pr_warning("module %s: Out of range jump to"
-                                          " %#llx at %#llx (%p)\n", me->name,
-                                          sym->st_value + rel[i].r_addend,
-                                          rel[i].r_offset, location);
+                               pr_warn("module %s: Out of range jump to %#llx at %#llx (%p)\n",
+                                       me->name,
+                                       sym->st_value + rel[i].r_addend,
+                                       rel[i].r_offset, location);
                                return -ENOEXEC;
                        }
                        MUNGE(create_JumpOff_X1);