gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level>

Use a more common logging style.

Miscellanea:

o Coalesce formats and realign arguments
o Neaten a few macros now using pr_<level>

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 19 insertions, 25 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index 1b50e6c13fb3..d1444aaca038 100644
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -166,7 +166,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
                 case ATOM_IIO_END:
                         return temp;
                 default:
-                        printk(KERN_INFO "Unknown IIO opcode.\n");
+                        pr_info("Unknown IIO opcode\n");
                         return 0;
                 }
 }
@@ -190,22 +190,19 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
                         val = gctx->card->reg_read(gctx->card, idx);
                         break;
                 case ATOM_IO_PCI:
-                        printk(KERN_INFO
-                               "PCI registers are not implemented.\n");
+                        pr_info("PCI registers are not implemented\n");
                         return 0;
                 case ATOM_IO_SYSIO:
-                        printk(KERN_INFO
-                               "SYSIO registers are not implemented.\n");
+                        pr_info("SYSIO registers are not implemented\n");
                         return 0;
                 default:
                         if (!(gctx->io_mode & 0x80)) {
-                                printk(KERN_INFO "Bad IO mode.\n");
+                                pr_info("Bad IO mode\n");
                                 return 0;
                         }
                         if (!gctx->iio[gctx->io_mode & 0x7F]) {
-                                printk(KERN_INFO
-                                       "Undefined indirect IO read method %d.\n",
-                                       gctx->io_mode & 0x7F);
+                                pr_info("Undefined indirect IO read method %d\n",
+                                        gctx->io_mode & 0x7F);
                                 return 0;
                         }
                         val =
@@ -469,22 +466,19 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
                                 gctx->card->reg_write(gctx->card, idx, val);
                         break;
                 case ATOM_IO_PCI:
-                        printk(KERN_INFO
-                               "PCI registers are not implemented.\n");
+                        pr_info("PCI registers are not implemented\n");
                         return;
                 case ATOM_IO_SYSIO:
-                        printk(KERN_INFO
-                               "SYSIO registers are not implemented.\n");
+                        pr_info("SYSIO registers are not implemented\n");
                         return;
                 default:
                         if (!(gctx->io_mode & 0x80)) {
-                                printk(KERN_INFO "Bad IO mode.\n");
+                                pr_info("Bad IO mode\n");
                                 return;
                         }
                         if (!gctx->iio[gctx->io_mode & 0xFF]) {
-                                printk(KERN_INFO
-                                       "Undefined indirect IO write method %d.\n",
-                                       gctx->io_mode & 0x7F);
+                                pr_info("Undefined indirect IO write method %d\n",
+                                        gctx->io_mode & 0x7F);
                                 return;
                         }
                         atom_iio_execute(gctx, gctx->iio[gctx->io_mode & 0xFF],
@@ -850,17 +844,17 @@ static void atom_op_postcard(atom_exec_context *ctx, int *ptr, int arg)
 
 static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg)
 {
-        printk(KERN_INFO "unimplemented!\n");
+        pr_info("unimplemented!\n");
 }
 
 static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg)
 {
-        printk(KERN_INFO "unimplemented!\n");
+        pr_info("unimplemented!\n");
 }
 
 static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg)
 {
-        printk(KERN_INFO "unimplemented!\n");
+        pr_info("unimplemented!\n");
 }
 
 static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg)
@@ -1023,7 +1017,7 @@ static void atom_op_switch(atom_exec_context *ctx, int *ptr, int arg)
                         }
                         (*ptr) += 2;
                 } else {
-                        printk(KERN_INFO "Bad case.\n");
+                        pr_info("Bad case\n");
                         return;
                 }
         (*ptr) += 2;
@@ -1316,14 +1310,14 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
         ctx->bios = bios;
 
         if (CU16(0) != ATOM_BIOS_MAGIC) {
-                printk(KERN_INFO "Invalid BIOS magic.\n");
+                pr_info("Invalid BIOS magic\n");
                 kfree(ctx);
                 return NULL;
         }
         if (strncmp
             (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC,
              strlen(ATOM_ATI_MAGIC))) {
-                printk(KERN_INFO "Invalid ATI magic.\n");
+                pr_info("Invalid ATI magic\n");
                 kfree(ctx);
                 return NULL;
         }
@@ -1332,7 +1326,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
         if (strncmp
             (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC,
              strlen(ATOM_ROM_MAGIC))) {
-                printk(KERN_INFO "Invalid ATOM magic.\n");
+                pr_info("Invalid ATOM magic\n");
                 kfree(ctx);
                 return NULL;
         }
@@ -1356,7 +1350,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
                         break;
                 }
         }
-        printk(KERN_INFO "ATOM BIOS: %s\n", name);
+        pr_info("ATOM BIOS: %s\n", name);
 
         return ctx;
 }