| Message ID | 71505cac9ae8f360133dd2ac4e3624ec5b2c0427.1488245365.git.joe@perches.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 27, 2017 at 05:31:04PM -0800, Joe Perches wrote: > 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> I know this is pain, but can you pls split this into: - amd/radeon drivers - drm core (anything that's not a subdirectory) - all other drivers for merge technical reasons? DRM is huge, we need to split big patches like this one to avoid conflict chaos. Patch 1 only touches amd stuff, so can go in directly with Alex' tree. -Daniel > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- > drivers/gpu/drm/amd/amdgpu/atom.c | 44 ++++++++--------- > drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++-- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++-- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +- > drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 4 +- > drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- > drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- > drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 4 +- > drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +++--- > .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- > drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 4 +- > drivers/gpu/drm/drm_cache.c | 12 ++--- > drivers/gpu/drm/drm_edid.c | 4 +- > drivers/gpu/drm/drm_ioc32.c | 3 +- > drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 ++-- > drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +++---- > drivers/gpu/drm/gma500/psb_drv.h | 5 +- > drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 ++- > drivers/gpu/drm/i915/i915_sw_fence.c | 8 ++-- > drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- > drivers/gpu/drm/msm/msm_drv.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-- > drivers/gpu/drm/nouveau/nouveau_vga.c | 4 +- > drivers/gpu/drm/nouveau/nv50_display.c | 22 ++++----- > drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 ++-- > drivers/gpu/drm/omapdrm/dss/dsi.c | 17 ++++--- > drivers/gpu/drm/omapdrm/dss/dss.c | 3 +- > drivers/gpu/drm/omapdrm/dss/dss.h | 15 +++--- > drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- > drivers/gpu/drm/r128/r128_cce.c | 7 ++- > drivers/gpu/drm/radeon/atom.c | 46 ++++++++---------- > drivers/gpu/drm/radeon/cik.c | 56 ++++++++-------------- > drivers/gpu/drm/radeon/evergreen.c | 2 +- > drivers/gpu/drm/radeon/evergreen_cs.c | 7 ++- > drivers/gpu/drm/radeon/ni.c | 22 +++------ > drivers/gpu/drm/radeon/r100.c | 18 +++---- > drivers/gpu/drm/radeon/r200.c | 3 +- > drivers/gpu/drm/radeon/r300.c | 13 ++--- > drivers/gpu/drm/radeon/r420.c | 9 ++-- > drivers/gpu/drm/radeon/r520.c | 3 +- > drivers/gpu/drm/radeon/r600.c | 21 +++----- > drivers/gpu/drm/radeon/r600_cs.c | 7 ++- > drivers/gpu/drm/radeon/radeon.h | 3 +- > drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- > drivers/gpu/drm/radeon/radeon_audio.c | 4 +- > drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- > drivers/gpu/drm/radeon/radeon_device.c | 8 ++-- > drivers/gpu/drm/radeon/radeon_fb.c | 3 +- > drivers/gpu/drm/radeon/radeon_gem.c | 4 +- > drivers/gpu/drm/radeon/radeon_test.c | 6 +-- > drivers/gpu/drm/radeon/rs400.c | 4 +- > drivers/gpu/drm/radeon/rs690.c | 3 +- > drivers/gpu/drm/radeon/rv515.c | 9 ++-- > drivers/gpu/drm/radeon/si.c | 45 ++++++----------- > drivers/gpu/drm/ttm/ttm_bo.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +-- > drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- > 69 files changed, 253 insertions(+), 362 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index c1b913541739..3f636632c289 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1515,7 +1515,8 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v); > */ > #define RREG32(reg) amdgpu_mm_rreg(adev, (reg), false) > #define RREG32_IDX(reg) amdgpu_mm_rreg(adev, (reg), true) > -#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", amdgpu_mm_rreg(adev, (reg), false)) > +#define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n", \ > + amdgpu_mm_rreg(adev, (reg), false)) > #define WREG32(reg, v) amdgpu_mm_wreg(adev, (reg), (v), false) > #define WREG32_IDX(reg, v) amdgpu_mm_wreg(adev, (reg), (v), true) > #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c > index 857ba0897159..3889486f71fe 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c > @@ -74,9 +74,9 @@ static void amdgpu_afmt_calc_cts(uint32_t clock, int *CTS, int *N, int freq) > > /* Check that we are in spec (not always possible) */ > if (n < (128*freq/1500)) > - printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); > + pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n"); > if (n > (128*freq/300)) > - printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); > + pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n"); > > *N = n; > *CTS = cts; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > index 6c343a933182..c13c51af0b68 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > @@ -583,8 +583,8 @@ static bool amdgpu_atpx_detect(void) > > if (has_atpx && vga_count == 2) { > acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); > - printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", > - acpi_method_name); > + pr_info("vga_switcheroo: detected switching method %s handle\n", > + acpi_method_name); > amdgpu_atpx_priv.atpx_detected = true; > amdgpu_atpx_priv.bridge_pm_usable = d3_supported; > amdgpu_atpx_init(); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 6abb238b25c9..85eeae05ac27 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1059,7 +1059,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero > if (state == VGA_SWITCHEROO_ON) { > unsigned d3_delay = dev->pdev->d3_delay; > > - printk(KERN_INFO "amdgpu: switched on\n"); > + pr_info("amdgpu: switched on\n"); > /* don't suspend or resume card normally */ > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > > @@ -1070,7 +1070,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero > dev->switch_power_state = DRM_SWITCH_POWER_ON; > drm_kms_helper_poll_enable(dev); > } else { > - printk(KERN_INFO "amdgpu: switched off\n"); > + pr_info("amdgpu: switched off\n"); > drm_kms_helper_poll_disable(dev); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > amdgpu_device_suspend(dev, true, true); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c > index 36ce3cac81ba..35a287280363 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c > @@ -150,8 +150,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, > AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, > true, &gobj); > if (ret) { > - printk(KERN_ERR "failed to allocate framebuffer (%d)\n", > - aligned_size); > + pr_err("failed to allocate framebuffer (%d)\n", aligned_size); > return -ENOMEM; > } > abo = gem_to_amdgpu_bo(gobj); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c > index e05a24325eeb..b0483e6e536f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c > @@ -228,7 +228,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) > out_cleanup: > kfree(gtt_obj); > if (r) { > - printk(KERN_WARNING "Error while testing BO move.\n"); > + pr_warn("Error while testing BO move\n"); > } > } > > 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; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c > index f97ecb49972e..b59e7e5d7279 100644 > --- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c > +++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c > @@ -5804,9 +5804,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev) > > out: > if (err) { > - printk(KERN_ERR > - "cik_smc: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("cik_smc: Failed to load firmware \"%s\"\n", fw_name); > release_firmware(adev->pm.fw); > adev->pm.fw = NULL; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > index 810bba533975..c33bc1bb4655 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > @@ -142,9 +142,7 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev) > } > out: > if (err) { > - printk(KERN_ERR > - "cik_sdma: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name); > for (i = 0; i < adev->sdma.num_instances; i++) { > release_firmware(adev->sdma.instance[i].fw); > adev->sdma.instance[i].fw = NULL; > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > index 2086e7e68de4..c8f9c1414940 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c > @@ -378,9 +378,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev) > > out: > if (err) { > - printk(KERN_ERR > - "gfx6: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("gfx6: Failed to load firmware \"%s\"\n", fw_name); > release_firmware(adev->gfx.pfp_fw); > adev->gfx.pfp_fw = NULL; > release_firmware(adev->gfx.me_fw); > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > index 1f9354541f29..82c574cf3658 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c > @@ -972,9 +972,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev) > > out: > if (err) { > - printk(KERN_ERR > - "gfx7: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name); > release_firmware(adev->gfx.pfp_fw); > adev->gfx.pfp_fw = NULL; > release_firmware(adev->gfx.me_fw); > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > index 8d05e0c4e3d7..52594b9fd182 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c > @@ -161,9 +161,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) > > out: > if (err) { > - printk(KERN_ERR > - "cik_mc: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name); > release_firmware(adev->mc.fw); > adev->mc.fw = NULL; > } > @@ -938,12 +936,12 @@ static int gmc_v7_0_sw_init(void *handle) > if (r) { > adev->need_dma32 = true; > dma_bits = 32; > - printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); > + pr_warn("amdgpu: No suitable DMA available\n"); > } > r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); > if (r) { > pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); > - printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); > + pr_warn("amdgpu: No coherent DMA available\n"); > } > > r = gmc_v7_0_init_microcode(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > index 7669b3259f35..421507aea36a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c > @@ -245,9 +245,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) > > out: > if (err) { > - printk(KERN_ERR > - "mc: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("mc: Failed to load firmware \"%s\"\n", fw_name); > release_firmware(adev->mc.fw); > adev->mc.fw = NULL; > } > @@ -950,12 +948,12 @@ static int gmc_v8_0_sw_init(void *handle) > if (r) { > adev->need_dma32 = true; > dma_bits = 32; > - printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); > + pr_warn("amdgpu: No suitable DMA available\n"); > } > r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); > if (r) { > pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); > - printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); > + pr_warn("amdgpu: No coherent DMA available\n"); > } > > r = gmc_v8_0_init_microcode(adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > index 896be64b7013..a881cf475a19 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > @@ -170,9 +170,7 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev) > > out: > if (err) { > - printk(KERN_ERR > - "sdma_v2_4: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name); > for (i = 0; i < adev->sdma.num_instances; i++) { > release_firmware(adev->sdma.instance[i].fw); > adev->sdma.instance[i].fw = NULL; > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > index 011800f621c6..255fab5fceee 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > @@ -321,9 +321,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) > } > out: > if (err) { > - printk(KERN_ERR > - "sdma_v3_0: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name); > for (i = 0; i < adev->sdma.num_instances; i++) { > release_firmware(adev->sdma.instance[i].fw); > adev->sdma.instance[i].fw = NULL; > diff --git a/drivers/gpu/drm/amd/include/amd_pcie_helpers.h b/drivers/gpu/drm/amd/include/amd_pcie_helpers.h > index 5725bf85eacc..7e5a965450c7 100644 > --- a/drivers/gpu/drm/amd/include/amd_pcie_helpers.h > +++ b/drivers/gpu/drm/amd/include/amd_pcie_helpers.h > @@ -82,7 +82,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap, > > switch (pcie_lane_width_cap) { > case 0: > - printk(KERN_ERR "No valid PCIE lane width reported"); > + pr_err("No valid PCIE lane width reported\n"); > break; > case CAIL_PCIE_LINK_WIDTH_SUPPORT_X1: > new_pcie_lanes = 1; > @@ -126,7 +126,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap, > } > } > if (j > 7) > - printk(KERN_ERR "Cannot find a valid PCIE lane width!"); > + pr_err("Cannot find a valid PCIE lane width!\n"); > } > } > break; > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > index f75ee33ec5bb..418f87e805b2 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > @@ -1544,7 +1544,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr) > if (vddc >= 2000 || vddc == 0) > return -EINVAL; > } else { > - pr_warning("failed to retrieving EVV voltage!\n"); > + pr_warn("failed to retrieving EVV voltage!\n"); > continue; > } > > diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h > index 072880130cfb..f3f9ebb631a5 100644 > --- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h > +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h > @@ -37,7 +37,7 @@ > #define PP_ASSERT_WITH_CODE(cond, msg, code) \ > do { \ > if (!(cond)) { \ > - pr_warning("%s\n", msg); \ > + pr_warn("%s\n", msg); \ > code; \ > } \ > } while (0) > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c > index 0f7a77b7312e..5450f5ef8e89 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c > @@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member) > return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold); > } > } > - pr_warning("can't get the offset of type %x member %x\n", type, member); > + pr_warn("can't get the offset of type %x member %x\n", type, member); > return 0; > } > > @@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value) > return SMU73_MAX_LEVELS_MVDD; > } > > - pr_warning("can't get the mac of %x\n", value); > + pr_warn("can't get the mac of %x\n", value); > return 0; > } > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c > index ad82161df831..b609ab7e9b97 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c > @@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr) > break; > default: > smu_data->power_tune_defaults = &defaults_iceland; > - pr_warning("Unknown V.I. Device ID.\n"); > + pr_warn("Unknown V.I. Device ID\n"); > break; > } > return; > @@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, > return -EINVAL); > > if (NULL == hwmgr->dyn_state.cac_leakage_table) { > - pr_warning("CAC Leakage Table does not exist, using vddc.\n"); > + pr_warn("CAC Leakage Table does not exist, using vddc\n"); > return 0; > } > > @@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, > *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE; > *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE); > } else { > - pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n"); > + pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table\n"); > *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE; > *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE); > } > @@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, > *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE; > *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE; > } else { > - pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table."); > + pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table\n"); > *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE; > *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE); > } > @@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, > } > > if (!vol_found) > - pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n"); > + pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc\n"); > } > > return 0; > @@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member) > return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold); > } > } > - pr_warning("can't get the offset of type %x member %x\n", type, member); > + pr_warn("can't get the offset of type %x member %x\n", type, member); > return 0; > } > > @@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value) > return SMU71_MAX_LEVELS_MVDD; > } > > - pr_warning("can't get the mac of %x\n", value); > + pr_warn("can't get the mac of %x\n", value); > return 0; > } > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c > index 80e2329a1b9e..c9ca7a1ac171 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c > @@ -2184,7 +2184,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member) > return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold); > } > } > - pr_warning("can't get the offset of type %x member %x\n", type, member); > + pr_warn("can't get the offset of type %x member %x\n", type, member); > return 0; > } > > @@ -2211,7 +2211,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value) > return SMU7_UVD_MCLK_HANDSHAKE_DISABLE; > } > > - pr_warning("can't get the mac of %x\n", value); > + pr_warn("can't get the mac of %x\n", value); > return 0; > } > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c > index 331b0aba4a13..4d1439a498eb 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c > @@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member) > return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold); > } > } > - pr_warning("can't get the offset of type %x member %x\n", type, member); > + pr_warn("can't get the offset of type %x member %x\n", type, member); > return 0; > } > > @@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value) > case SMU_MAX_LEVELS_MVDD: > return SMU72_MAX_LEVELS_MVDD; > } > - pr_warning("can't get the mac value %x\n", value); > + pr_warn("can't get the mac value %x\n", value); > > return 0; > } > diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c > index c3b9aaccdf42..3bd76e918b5d 100644 > --- a/drivers/gpu/drm/drm_cache.c > +++ b/drivers/gpu/drm/drm_cache.c > @@ -88,7 +88,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) > } > > if (wbinvd_on_all_cpus()) > - printk(KERN_ERR "Timed out waiting for cache flush.\n"); > + pr_err("Timed out waiting for cache flush\n"); > > #elif defined(__powerpc__) > unsigned long i; > @@ -105,7 +105,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) > kunmap_atomic(page_virtual); > } > #else > - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); > + pr_err("Architecture has no drm_cache.c support\n"); > WARN_ON_ONCE(1); > #endif > } > @@ -134,9 +134,9 @@ drm_clflush_sg(struct sg_table *st) > } > > if (wbinvd_on_all_cpus()) > - printk(KERN_ERR "Timed out waiting for cache flush.\n"); > + pr_err("Timed out waiting for cache flush\n"); > #else > - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); > + pr_err("Architecture has no drm_cache.c support\n"); > WARN_ON_ONCE(1); > #endif > } > @@ -167,9 +167,9 @@ drm_clflush_virt_range(void *addr, unsigned long length) > } > > if (wbinvd_on_all_cpus()) > - printk(KERN_ERR "Timed out waiting for cache flush.\n"); > + pr_err("Timed out waiting for cache flush\n"); > #else > - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); > + pr_err("Architecture has no drm_cache.c support\n"); > WARN_ON_ONCE(1); > #endif > } > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index c8baab9bee0d..ca4f054f71b2 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -1164,9 +1164,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, > bad: > if (print_bad_edid) { > if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) { > - printk(KERN_ERR "EDID block is all zeroes\n"); > + pr_err("EDID block is all zeroes\n"); > } else { > - printk(KERN_ERR "Raw EDID:\n"); > + pr_err("Raw EDID:\n"); > print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1, > raw_edid, EDID_LENGTH, false); > } > diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c > index 867ab8c1582b..b134482f4022 100644 > --- a/drivers/gpu/drm/drm_ioc32.c > +++ b/drivers/gpu/drm/drm_ioc32.c > @@ -257,8 +257,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, > > m32.handle = (unsigned long)handle; > if (m32.handle != (unsigned long)handle) > - printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle" > - " %p for type %d offset %x\n", > + pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n", > handle, m32.type, m32.offset); > > if (copy_to_user(argp, &m32, sizeof(m32))) > diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c > index 5efdb7fbb7ee..e64960db3224 100644 > --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c > +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c > @@ -284,8 +284,7 @@ static bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder, > head) { > if (tmp_encoder != encoder > && tmp_encoder->crtc == encoder->crtc) { > - printk(KERN_ERR "Can't enable LVDS and another " > - "encoder on the same pipe\n"); > + pr_err("Can't enable LVDS and another encoder on the same pipe\n"); > return false; > } > } > @@ -756,13 +755,13 @@ void cdv_intel_lvds_init(struct drm_device *dev, > > failed_find: > mutex_unlock(&dev->mode_config.mutex); > - printk(KERN_ERR "Failed find\n"); > + pr_err("Failed find\n"); > psb_intel_i2c_destroy(gma_encoder->ddc_bus); > failed_ddc: > - printk(KERN_ERR "Failed DDC\n"); > + pr_err("Failed DDC\n"); > psb_intel_i2c_destroy(gma_encoder->i2c_bus); > failed_blc_i2c: > - printk(KERN_ERR "Failed BLC\n"); > + pr_err("Failed BLC\n"); > drm_encoder_cleanup(encoder); > drm_connector_cleanup(connector); > kfree(lvds_priv); > diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c > index f7038f12ac76..e6943fef0611 100644 > --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c > +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c > @@ -255,15 +255,15 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev, > ((ti->vblank_hi << 8) | ti->vblank_lo); > mode->clock = ti->pixel_clock * 10; > #if 0 > - printk(KERN_INFO "hdisplay is %d\n", mode->hdisplay); > - printk(KERN_INFO "vdisplay is %d\n", mode->vdisplay); > - printk(KERN_INFO "HSS is %d\n", mode->hsync_start); > - printk(KERN_INFO "HSE is %d\n", mode->hsync_end); > - printk(KERN_INFO "htotal is %d\n", mode->htotal); > - printk(KERN_INFO "VSS is %d\n", mode->vsync_start); > - printk(KERN_INFO "VSE is %d\n", mode->vsync_end); > - printk(KERN_INFO "vtotal is %d\n", mode->vtotal); > - printk(KERN_INFO "clock is %d\n", mode->clock); > + pr_info("hdisplay is %d\n", mode->hdisplay); > + pr_info("vdisplay is %d\n", mode->vdisplay); > + pr_info("HSS is %d\n", mode->hsync_start); > + pr_info("HSE is %d\n", mode->hsync_end); > + pr_info("htotal is %d\n", mode->htotal); > + pr_info("VSS is %d\n", mode->vsync_start); > + pr_info("VSE is %d\n", mode->vsync_end); > + pr_info("vtotal is %d\n", mode->vtotal); > + pr_info("clock is %d\n", mode->clock); > #endif > mode_dev->panel_fixed_mode = mode; > } > diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h > index 83e22fd4cfc0..83667087d6e5 100644 > --- a/drivers/gpu/drm/gma500/psb_drv.h > +++ b/drivers/gpu/drm/gma500/psb_drv.h > @@ -905,9 +905,8 @@ static inline void REGISTER_WRITE8(struct drm_device *dev, > #define PSB_RSGX32(_offs) \ > ({ \ > if (inl(dev_priv->apm_base + PSB_APM_STS) & 0x3) { \ > - printk(KERN_ERR \ > - "access sgx when it's off!! (READ) %s, %d\n", \ > - __FILE__, __LINE__); \ > + pr_err("access sgx when it's off!! (READ) %s, %d\n", \ > + __FILE__, __LINE__); \ > melay(1000); \ > } \ > ioread32(dev_priv->sgx_reg + (_offs)); \ > diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c > index 483fdce74e39..0066fe7e622e 100644 > --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c > +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c > @@ -388,11 +388,11 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, > > /* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */ > if (!IS_MRST(dev) && gma_crtc->pipe == 0) { > - printk(KERN_ERR "Can't support LVDS on pipe A\n"); > + pr_err("Can't support LVDS on pipe A\n"); > return false; > } > if (IS_MRST(dev) && gma_crtc->pipe != 0) { > - printk(KERN_ERR "Must use PIPE A\n"); > + pr_err("Must use PIPE A\n"); > return false; > } > /* Should never happen!! */ > @@ -400,8 +400,7 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, > head) { > if (tmp_encoder != encoder > && tmp_encoder->crtc == encoder->crtc) { > - printk(KERN_ERR "Can't enable LVDS and another " > - "encoder on the same pipe\n"); > + pr_err("Can't enable LVDS and another encoder on the same pipe\n"); > return false; > } > } > diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c > index 40f4e5efaf83..a277f8eb7beb 100644 > --- a/drivers/gpu/drm/i915/i915_sw_fence.c > +++ b/drivers/gpu/drm/i915/i915_sw_fence.c > @@ -395,10 +395,10 @@ static void timer_i915_sw_fence_wake(unsigned long data) > { > struct i915_sw_dma_fence_cb *cb = (struct i915_sw_dma_fence_cb *)data; > > - printk(KERN_WARNING "asynchronous wait on fence %s:%s:%x timed out\n", > - cb->dma->ops->get_driver_name(cb->dma), > - cb->dma->ops->get_timeline_name(cb->dma), > - cb->dma->seqno); > + pr_warn("asynchronous wait on fence %s:%s:%x timed out\n", > + cb->dma->ops->get_driver_name(cb->dma), > + cb->dma->ops->get_timeline_name(cb->dma), > + cb->dma->seqno); > dma_fence_put(cb->dma); > cb->dma = NULL; > > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c > index 3938120e5051..f2e9b2bc18a5 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c > @@ -195,7 +195,7 @@ static int mga_g200se_set_plls(struct mga_device *mdev, long clock) > } > > if (delta > permitteddelta) { > - printk(KERN_WARNING "PLL delta too large\n"); > + pr_warn("PLL delta too large\n"); > return 1; > } > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 70226eaa5cac..462e7d5bd872 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -152,7 +152,7 @@ u32 msm_readl(const void __iomem *addr) > { > u32 val = readl(addr); > if (reglog) > - printk(KERN_ERR "IO:R %p %08x\n", addr, val); > + pr_err("IO:R %p %08x\n", addr, val); > return val; > } > > diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c > index 193573d191e5..39468c218027 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c > +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c > @@ -326,7 +326,7 @@ static bool nouveau_dsm_detect(void) > nouveau_dsm_priv.dhandle = dhandle; > acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, > &buffer); > - printk(KERN_INFO "VGA switcheroo: detected Optimus DSM method %s handle\n", > + pr_info("VGA switcheroo: detected Optimus DSM method %s handle\n", > acpi_method_name); > if (has_power_resources) > pr_info("nouveau: detected PR support, will not use DSM\n"); > @@ -338,7 +338,7 @@ static bool nouveau_dsm_detect(void) > nouveau_dsm_priv.dhandle = dhandle; > acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, > &buffer); > - printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n", > + pr_info("VGA switcheroo: detected DSM switching method %s handle\n", > acpi_method_name); > nouveau_dsm_priv.dsm_detected = true; > ret = true; > @@ -406,7 +406,8 @@ static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios, > > status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer); > if (ACPI_FAILURE(status)) { > - printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status)); > + pr_info("failed to evaluate ROM got %s\n", > + acpi_format_exception(status)); > return -ENODEV; > } > obj = (union acpi_object *)buffer.pointer; > diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c > index eef22c6b9665..ccb597eac538 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_vga.c > +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c > @@ -41,13 +41,13 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev, > return; > > if (state == VGA_SWITCHEROO_ON) { > - printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); > + pr_err("VGA switcheroo: switched nouveau on\n"); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > nouveau_pmops_resume(&pdev->dev); > drm_kms_helper_poll_enable(dev); > dev->switch_power_state = DRM_SWITCH_POWER_ON; > } else { > - printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); > + pr_err("VGA switcheroo: switched nouveau off\n"); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > drm_kms_helper_poll_disable(dev); > nouveau_switcheroo_optimus_dsm(); > diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c > index 0b4440ffbeae..ff7437b2762d 100644 > --- a/drivers/gpu/drm/nouveau/nv50_display.c > +++ b/drivers/gpu/drm/nouveau/nv50_display.c > @@ -705,7 +705,7 @@ evo_wait(void *evoc, int nr) > break; > ) < 0) { > mutex_unlock(&dmac->lock); > - printk(KERN_ERR "nouveau: evo channel stalled\n"); > + pr_err("nouveau: evo channel stalled\n"); > return NULL; > } > > @@ -723,18 +723,18 @@ evo_kick(u32 *push, void *evoc) > mutex_unlock(&dmac->lock); > } > > -#define evo_mthd(p,m,s) do { \ > - const u32 _m = (m), _s = (s); \ > - if (drm_debug & DRM_UT_KMS) \ > - printk(KERN_ERR "%04x %d %s\n", _m, _s, __func__); \ > - *((p)++) = ((_s << 18) | _m); \ > +#define evo_mthd(p, m, s) do { \ > + const u32 _m = (m), _s = (s); \ > + if (drm_debug & DRM_UT_KMS) \ > + pr_err("%04x %d %s\n", _m, _s, __func__); \ > + *((p)++) = ((_s << 18) | _m); \ > } while(0) > > -#define evo_data(p,d) do { \ > - const u32 _d = (d); \ > - if (drm_debug & DRM_UT_KMS) \ > - printk(KERN_ERR "\t%08x\n", _d); \ > - *((p)++) = _d; \ > +#define evo_data(p, d) do { \ > + const u32 _d = (d); \ > + if (drm_debug & DRM_UT_KMS) \ > + pr_err("\t%08x\n", _d); \ > + *((p)++) = _d; \ > } while(0) > > /****************************************************************************** > diff --git a/drivers/gpu/drm/nouveau/nvkm/core/mm.c b/drivers/gpu/drm/nouveau/nvkm/core/mm.c > index fd19d652a7ab..5c7891234eea 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/core/mm.c > +++ b/drivers/gpu/drm/nouveau/nvkm/core/mm.c > @@ -31,15 +31,15 @@ nvkm_mm_dump(struct nvkm_mm *mm, const char *header) > { > struct nvkm_mm_node *node; > > - printk(KERN_ERR "nvkm: %s\n", header); > - printk(KERN_ERR "nvkm: node list:\n"); > + pr_err("nvkm: %s\n", header); > + pr_err("nvkm: node list:\n"); > list_for_each_entry(node, &mm->nodes, nl_entry) { > - printk(KERN_ERR "nvkm: \t%08x %08x %d\n", > + pr_err("nvkm: \t%08x %08x %d\n", > node->offset, node->length, node->type); > } > - printk(KERN_ERR "nvkm: free list:\n"); > + pr_err("nvkm: free list:\n"); > list_for_each_entry(node, &mm->free, fl_entry) { > - printk(KERN_ERR "nvkm: \t%08x %08x %d\n", > + pr_err("nvkm: \t%08x %08x %d\n", > node->offset, node->length, node->type); > } > } > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index f74615d005a8..5e51a5649efb 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -582,15 +582,14 @@ static void dsi_perf_show(struct platform_device *dsidev, const char *name) > > total_bytes = dsi->update_bytes; > > - printk(KERN_INFO "DSI(%s): %u us + %u us = %u us (%uHz), " > - "%u bytes, %u kbytes/sec\n", > - name, > - setup_us, > - trans_us, > - total_us, > - 1000*1000 / total_us, > - total_bytes, > - total_bytes * 1000 / total_us); > + pr_info("DSI(%s): %u us + %u us = %u us (%uHz), %u bytes, %u kbytes/sec\n", > + name, > + setup_us, > + trans_us, > + total_us, > + 1000 * 1000 / total_us, > + total_bytes, > + total_bytes * 1000 / total_us); > } > #else > static inline void dsi_perf_mark_setup(struct platform_device *dsidev) > diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c > index 14887d5b02e5..4e72d2fefb4d 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dss.c > +++ b/drivers/gpu/drm/omapdrm/dss/dss.c > @@ -1254,8 +1254,7 @@ static int dss_bind(struct device *dev) > dss.lcd_clk_source[1] = DSS_CLK_SRC_FCK; > > rev = dss_read_reg(DSS_REVISION); > - printk(KERN_INFO "OMAP DSS rev %d.%d\n", > - FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); > + pr_info("OMAP DSS rev %d.%d\n", FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); > > dss_runtime_put(); > > diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h > index 56493b290731..78f6fc75948b 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dss.h > +++ b/drivers/gpu/drm/omapdrm/dss/dss.h > @@ -42,29 +42,26 @@ > > #ifdef DSS_SUBSYS_NAME > #define DSSERR(format, ...) \ > - printk(KERN_ERR "omapdss " DSS_SUBSYS_NAME " error: " format, \ > - ## __VA_ARGS__) > + pr_err("omapdss " DSS_SUBSYS_NAME " error: " format, ##__VA_ARGS__) > #else > #define DSSERR(format, ...) \ > - printk(KERN_ERR "omapdss error: " format, ## __VA_ARGS__) > + pr_err("omapdss error: " format, ##__VA_ARGS__) > #endif > > #ifdef DSS_SUBSYS_NAME > #define DSSINFO(format, ...) \ > - printk(KERN_INFO "omapdss " DSS_SUBSYS_NAME ": " format, \ > - ## __VA_ARGS__) > + pr_info("omapdss " DSS_SUBSYS_NAME ": " format, ##__VA_ARGS__) > #else > #define DSSINFO(format, ...) \ > - printk(KERN_INFO "omapdss: " format, ## __VA_ARGS__) > + pr_info("omapdss: " format, ## __VA_ARGS__) > #endif > > #ifdef DSS_SUBSYS_NAME > #define DSSWARN(format, ...) \ > - printk(KERN_WARNING "omapdss " DSS_SUBSYS_NAME ": " format, \ > - ## __VA_ARGS__) > + pr_warn("omapdss " DSS_SUBSYS_NAME ": " format, ##__VA_ARGS__) > #else > #define DSSWARN(format, ...) \ > - printk(KERN_WARNING "omapdss: " format, ## __VA_ARGS__) > + pr_warn("omapdss: " format, ##__VA_ARGS__) > #endif > > /* OMAP TRM gives bitfields as start:end, where start is the higher bit > diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c > index 5d5a9f517c30..68a75b829b71 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem.c > +++ b/drivers/gpu/drm/omapdrm/omap_gem.c > @@ -1107,9 +1107,8 @@ static inline bool is_waiting(struct omap_gem_sync_waiter *waiter) > > /* macro for sync debug.. */ > #define SYNCDBG 0 > -#define SYNC(fmt, ...) do { if (SYNCDBG) \ > - printk(KERN_ERR "%s:%d: "fmt"\n", \ > - __func__, __LINE__, ##__VA_ARGS__); \ > +#define SYNC(fmt, ...) do { if (SYNCDBG) \ > + pr_err("%s:%d: " fmt "\n", __func__, __LINE__, ##__VA_ARGS__); \ > } while (0) > > > diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c > index 14fd83b5f497..c9890afe69d6 100644 > --- a/drivers/gpu/drm/r128/r128_cce.c > +++ b/drivers/gpu/drm/r128/r128_cce.c > @@ -149,20 +149,19 @@ static int r128_cce_load_microcode(drm_r128_private_t *dev_priv) > > pdev = platform_device_register_simple("r128_cce", 0, NULL, 0); > if (IS_ERR(pdev)) { > - printk(KERN_ERR "r128_cce: Failed to register firmware\n"); > + pr_err("r128_cce: Failed to register firmware\n"); > return PTR_ERR(pdev); > } > rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); > platform_device_unregister(pdev); > if (rc) { > - printk(KERN_ERR "r128_cce: Failed to load firmware \"%s\"\n", > + pr_err("r128_cce: Failed to load firmware \"%s\"\n", > FIRMWARE_NAME); > return rc; > } > > if (fw->size != 256 * 8) { > - printk(KERN_ERR > - "r128_cce: Bogus length %zu in firmware \"%s\"\n", > + pr_err("r128_cce: Bogus length %zu in firmware \"%s\"\n", > fw->size, FIRMWARE_NAME); > rc = -EINVAL; > goto out_release; > diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c > index f66c33dd21a3..6a2e091aa7b6 100644 > --- a/drivers/gpu/drm/radeon/atom.c > +++ b/drivers/gpu/drm/radeon/atom.c > @@ -170,7 +170,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; > } > } > @@ -194,22 +194,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 = > @@ -473,22 +470,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], > @@ -819,17 +813,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) > @@ -992,7 +986,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; > @@ -1026,7 +1020,7 @@ static void atom_op_xor(atom_exec_context *ctx, int *ptr, int arg) > > static void atom_op_debug(atom_exec_context *ctx, int *ptr, int arg) > { > - printk(KERN_INFO "unimplemented!\n"); > + pr_info("unimplemented!\n"); > } > > static struct { > @@ -1280,14 +1274,14 @@ struct atom_context *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; > } > @@ -1296,7 +1290,7 @@ struct atom_context *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; > } > @@ -1320,7 +1314,7 @@ struct atom_context *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; > } > diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c > index f6ff41a0eed6..b338d58e281f 100644 > --- a/drivers/gpu/drm/radeon/cik.c > +++ b/drivers/gpu/drm/radeon/cik.c > @@ -2069,8 +2069,7 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->pfp_fw->size != pfp_req_size) { > - printk(KERN_ERR > - "cik_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->pfp_fw->size, fw_name); > err = -EINVAL; > goto out; > @@ -2078,8 +2077,7 @@ static int cik_init_microcode(struct radeon_device *rdev) > } else { > err = radeon_ucode_validate(rdev->pfp_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2095,16 +2093,14 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->me_fw->size != me_req_size) { > - printk(KERN_ERR > - "cik_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->me_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->me_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2120,16 +2116,14 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->ce_fw->size != ce_req_size) { > - printk(KERN_ERR > - "cik_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->ce_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->ce_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2145,16 +2139,14 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->mec_fw->size != mec_req_size) { > - printk(KERN_ERR > - "cik_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->mec_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->mec_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2185,16 +2177,14 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->rlc_fw->size != rlc_req_size) { > - printk(KERN_ERR > - "cik_rlc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_rlc: Bogus length %zu in firmware \"%s\"\n", > rdev->rlc_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->rlc_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2210,16 +2200,14 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->sdma_fw->size != sdma_req_size) { > - printk(KERN_ERR > - "cik_sdma: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_sdma: Bogus length %zu in firmware \"%s\"\n", > rdev->sdma_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->sdma_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2242,8 +2230,7 @@ static int cik_init_microcode(struct radeon_device *rdev) > } > if ((rdev->mc_fw->size != mc_req_size) && > (rdev->mc_fw->size != mc2_req_size)){ > - printk(KERN_ERR > - "cik_mc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_mc: Bogus length %zu in firmware \"%s\"\n", > rdev->mc_fw->size, fw_name); > err = -EINVAL; > } > @@ -2251,8 +2238,7 @@ static int cik_init_microcode(struct radeon_device *rdev) > } else { > err = radeon_ucode_validate(rdev->mc_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2269,23 +2255,20 @@ static int cik_init_microcode(struct radeon_device *rdev) > snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); > err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); > if (err) { > - printk(KERN_ERR > - "smc: error loading firmware \"%s\"\n", > + pr_err("smc: error loading firmware \"%s\"\n", > fw_name); > release_firmware(rdev->smc_fw); > rdev->smc_fw = NULL; > err = 0; > } else if (rdev->smc_fw->size != smc_req_size) { > - printk(KERN_ERR > - "cik_smc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("cik_smc: Bogus length %zu in firmware \"%s\"\n", > rdev->smc_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->smc_fw); > if (err) { > - printk(KERN_ERR > - "cik_fw: validation failed for firmware \"%s\"\n", > + pr_err("cik_fw: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -2297,7 +2280,7 @@ static int cik_init_microcode(struct radeon_device *rdev) > if (new_fw == 0) { > rdev->new_fw = false; > } else if (new_fw < num_fw) { > - printk(KERN_ERR "ci_fw: mixing new and old firmware!\n"); > + pr_err("ci_fw: mixing new and old firmware!\n"); > err = -EINVAL; > } else { > rdev->new_fw = true; > @@ -2306,8 +2289,7 @@ static int cik_init_microcode(struct radeon_device *rdev) > out: > if (err) { > if (err != -EINVAL) > - printk(KERN_ERR > - "cik_cp: Failed to load firmware \"%s\"\n", > + pr_err("cik_cp: Failed to load firmware \"%s\"\n", > fw_name); > release_firmware(rdev->pfp_fw); > rdev->pfp_fw = NULL; > diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c > index 0b6b5766216f..d1b1e0cc3c25 100644 > --- a/drivers/gpu/drm/radeon/evergreen.c > +++ b/drivers/gpu/drm/radeon/evergreen.c > @@ -2486,7 +2486,7 @@ void evergreen_pcie_gart_tlb_flush(struct radeon_device *rdev) > tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); > tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; > if (tmp == 2) { > - printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); > + pr_warn("[drm] r600 flush TLB failed\n"); > return; > } > if (tmp) { > diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c > index f8b05090232a..54324330b91f 100644 > --- a/drivers/gpu/drm/radeon/evergreen_cs.c > +++ b/drivers/gpu/drm/radeon/evergreen_cs.c > @@ -1061,8 +1061,7 @@ static int evergreen_packet0_check(struct radeon_cs_parser *p, > } > break; > default: > - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", > - reg, idx); > + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); > return -EINVAL; > } > return 0; > @@ -2776,7 +2775,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) > } while (p->idx < p->chunk_ib->length_dw); > #if 0 > for (r = 0; r < p->ib.length_dw; r++) { > - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); > + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); > mdelay(1); > } > #endif > @@ -3215,7 +3214,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p) > } while (p->idx < p->chunk_ib->length_dw); > #if 0 > for (r = 0; r < p->ib->length_dw; r++) { > - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); > + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); > mdelay(1); > } > #endif > diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c > index a0d4a0522fdc..9eccd0c81d88 100644 > --- a/drivers/gpu/drm/radeon/ni.c > +++ b/drivers/gpu/drm/radeon/ni.c > @@ -774,8 +774,7 @@ int ni_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->pfp_fw->size != pfp_req_size) { > - printk(KERN_ERR > - "ni_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->pfp_fw->size, fw_name); > err = -EINVAL; > goto out; > @@ -786,8 +785,7 @@ int ni_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->me_fw->size != me_req_size) { > - printk(KERN_ERR > - "ni_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->me_fw->size, fw_name); > err = -EINVAL; > } > @@ -797,8 +795,7 @@ int ni_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->rlc_fw->size != rlc_req_size) { > - printk(KERN_ERR > - "ni_rlc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n", > rdev->rlc_fw->size, fw_name); > err = -EINVAL; > } > @@ -810,8 +807,7 @@ int ni_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->mc_fw->size != mc_req_size) { > - printk(KERN_ERR > - "ni_mc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n", > rdev->mc_fw->size, fw_name); > err = -EINVAL; > } > @@ -821,15 +817,12 @@ int ni_init_microcode(struct radeon_device *rdev) > snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); > err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); > if (err) { > - printk(KERN_ERR > - "smc: error loading firmware \"%s\"\n", > - fw_name); > + pr_err("smc: error loading firmware \"%s\"\n", fw_name); > release_firmware(rdev->smc_fw); > rdev->smc_fw = NULL; > err = 0; > } else if (rdev->smc_fw->size != smc_req_size) { > - printk(KERN_ERR > - "ni_mc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n", > rdev->mc_fw->size, fw_name); > err = -EINVAL; > } > @@ -838,8 +831,7 @@ int ni_init_microcode(struct radeon_device *rdev) > out: > if (err) { > if (err != -EINVAL) > - printk(KERN_ERR > - "ni_cp: Failed to load firmware \"%s\"\n", > + pr_err("ni_cp: Failed to load firmware \"%s\"\n", > fw_name); > release_firmware(rdev->pfp_fw); > rdev->pfp_fw = NULL; > diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c > index e3399310d41d..aefca0b03f38 100644 > --- a/drivers/gpu/drm/radeon/r100.c > +++ b/drivers/gpu/drm/radeon/r100.c > @@ -1042,11 +1042,9 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) > > err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); > if (err) { > - printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", > - fw_name); > + pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name); > } else if (rdev->me_fw->size % 8) { > - printk(KERN_ERR > - "radeon_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->me_fw->size, fw_name); > err = -EINVAL; > release_firmware(rdev->me_fw); > @@ -1087,8 +1085,7 @@ static void r100_cp_load_microcode(struct radeon_device *rdev) > int i, size; > > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > > if (rdev->me_fw) { > @@ -1246,8 +1243,7 @@ void r100_cp_disable(struct radeon_device *rdev) > WREG32(RADEON_CP_CSQ_CNTL, 0); > WREG32(R_000770_SCRATCH_UMSK, 0); > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > } > > @@ -1881,8 +1877,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, > track->tex_dirty = true; > break; > default: > - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", > - reg, idx); > + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); > return -EINVAL; > } > return 0; > @@ -2486,8 +2481,7 @@ int r100_gui_wait_for_idle(struct radeon_device *rdev) > uint32_t tmp; > > if (r100_rbbm_fifo_wait_for_entry(rdev, 64)) { > - printk(KERN_WARNING "radeon: wait for empty RBBM fifo failed !" > - " Bad things might happen.\n"); > + pr_warn("radeon: wait for empty RBBM fifo failed! Bad things might happen.\n"); > } > for (i = 0; i < rdev->usec_timeout; i++) { > tmp = RREG32(RADEON_RBBM_STATUS); > diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c > index c70e6d5bcd19..c22321cc5a41 100644 > --- a/drivers/gpu/drm/radeon/r200.c > +++ b/drivers/gpu/drm/radeon/r200.c > @@ -537,8 +537,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, > track->tex_dirty = true; > break; > default: > - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", > - reg, idx); > + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); > return -EINVAL; > } > return 0; > diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c > index 7e417d8dc733..21161aa8acbf 100644 > --- a/drivers/gpu/drm/radeon/r300.c > +++ b/drivers/gpu/drm/radeon/r300.c > @@ -387,8 +387,7 @@ static void r300_gpu_init(struct radeon_device *rdev) > WREG32(R300_GB_TILE_CONFIG, gb_tile_config); > > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > > tmp = RREG32(R300_DST_PIPE_CONFIG); > @@ -399,14 +398,12 @@ static void r300_gpu_init(struct radeon_device *rdev) > R300_DC_DC_DISABLE_IGNORE_PE); > > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > if (r300_mc_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait MC idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); > } > - DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized.\n", > + DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized\n", > rdev->num_gb_pipes, rdev->num_z_pipes); > } > > @@ -1165,7 +1162,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, > } > return 0; > fail: > - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d (val=%08x)\n", > + pr_err("Forbidden register 0x%04X in cs at %d (val=%08x)\n", > reg, idx, idx_value); > return -EINVAL; > } > diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c > index 2828605aef3f..3eb0c4f9f796 100644 > --- a/drivers/gpu/drm/radeon/r420.c > +++ b/drivers/gpu/drm/radeon/r420.c > @@ -92,8 +92,7 @@ void r420_pipes_init(struct radeon_device *rdev) > (1 << 2) | (1 << 3)); > /* add idle wait as per freedesktop.org bug 24041 */ > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > /* get max number of pipes */ > gb_pipe_select = RREG32(R400_GB_PIPE_SELECT); > @@ -128,8 +127,7 @@ void r420_pipes_init(struct radeon_device *rdev) > tmp |= R300_TILE_SIZE_16 | R300_ENABLE_TILING; > WREG32(R300_GB_TILE_CONFIG, tmp); > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > > tmp = RREG32(R300_DST_PIPE_CONFIG); > @@ -141,8 +139,7 @@ void r420_pipes_init(struct radeon_device *rdev) > R300_DC_DC_DISABLE_IGNORE_PE); > > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); > } > > if (rdev->family == CHIP_RV530) { > diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c > index 98d6053c36c6..074cf752faef 100644 > --- a/drivers/gpu/drm/radeon/r520.c > +++ b/drivers/gpu/drm/radeon/r520.c > @@ -86,8 +86,7 @@ static void r520_gpu_init(struct radeon_device *rdev) > (((gb_pipe_select >> 8) & 0xF) << 4); > WREG32_PLL(0x000D, tmp); > if (r520_mc_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait MC idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); > } > } > > diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c > index a951881c2a50..0a085176e79b 100644 > --- a/drivers/gpu/drm/radeon/r600.c > +++ b/drivers/gpu/drm/radeon/r600.c > @@ -1094,7 +1094,7 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev) > tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); > tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; > if (tmp == 2) { > - printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); > + pr_warn("[drm] r600 flush TLB failed\n"); > return; > } > if (tmp) { > @@ -2550,8 +2550,7 @@ int r600_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->pfp_fw->size != pfp_req_size) { > - printk(KERN_ERR > - "r600_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->pfp_fw->size, fw_name); > err = -EINVAL; > goto out; > @@ -2562,8 +2561,7 @@ int r600_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->me_fw->size != me_req_size) { > - printk(KERN_ERR > - "r600_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->me_fw->size, fw_name); > err = -EINVAL; > } > @@ -2573,8 +2571,7 @@ int r600_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->rlc_fw->size != rlc_req_size) { > - printk(KERN_ERR > - "r600_rlc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n", > rdev->rlc_fw->size, fw_name); > err = -EINVAL; > } > @@ -2583,15 +2580,12 @@ int r600_init_microcode(struct radeon_device *rdev) > snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name); > err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); > if (err) { > - printk(KERN_ERR > - "smc: error loading firmware \"%s\"\n", > - fw_name); > + pr_err("smc: error loading firmware \"%s\"\n", fw_name); > release_firmware(rdev->smc_fw); > rdev->smc_fw = NULL; > err = 0; > } else if (rdev->smc_fw->size != smc_req_size) { > - printk(KERN_ERR > - "smc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("smc: Bogus length %zu in firmware \"%s\"\n", > rdev->smc_fw->size, fw_name); > err = -EINVAL; > } > @@ -2600,8 +2594,7 @@ int r600_init_microcode(struct radeon_device *rdev) > out: > if (err) { > if (err != -EINVAL) > - printk(KERN_ERR > - "r600_cp: Failed to load firmware \"%s\"\n", > + pr_err("r600_cp: Failed to load firmware \"%s\"\n", > fw_name); > release_firmware(rdev->pfp_fw); > rdev->pfp_fw = NULL; > diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c > index 595a19736458..97fd58e97043 100644 > --- a/drivers/gpu/drm/radeon/r600_cs.c > +++ b/drivers/gpu/drm/radeon/r600_cs.c > @@ -932,8 +932,7 @@ static int r600_packet0_check(struct radeon_cs_parser *p, > } > break; > default: > - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", > - reg, idx); > + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); > return -EINVAL; > } > return 0; > @@ -2320,7 +2319,7 @@ int r600_cs_parse(struct radeon_cs_parser *p) > } while (p->idx < p->chunk_ib->length_dw); > #if 0 > for (r = 0; r < p->ib.length_dw; r++) { > - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); > + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); > mdelay(1); > } > #endif > @@ -2528,7 +2527,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p) > } while (p->idx < p->chunk_ib->length_dw); > #if 0 > for (r = 0; r < p->ib->length_dw; r++) { > - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); > + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); > mdelay(1); > } > #endif > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h > index 44e0c5ed6418..2e400dc414e3 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -2535,7 +2535,8 @@ static inline struct radeon_fence *to_radeon_fence(struct dma_fence *f) > #define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg)) > #define RREG32(reg) r100_mm_rreg(rdev, (reg), false) > #define RREG32_IDX(reg) r100_mm_rreg(rdev, (reg), true) > -#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg), false)) > +#define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n", \ > + r100_mm_rreg(rdev, (reg), false)) > #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v), false) > #define WREG32_IDX(reg, v) r100_mm_wreg(rdev, (reg), (v), true) > #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) > diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c > index 0ae13cd2adda..40be4068ca69 100644 > --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c > +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c > @@ -577,8 +577,8 @@ static bool radeon_atpx_detect(void) > > if (has_atpx && vga_count == 2) { > acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); > - printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", > - acpi_method_name); > + pr_info("vga_switcheroo: detected switching method %s handle\n", > + acpi_method_name); > radeon_atpx_priv.atpx_detected = true; > radeon_atpx_priv.bridge_pm_usable = d3_supported; > radeon_atpx_init(); > diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c > index b214663b370d..aaacac190d26 100644 > --- a/drivers/gpu/drm/radeon/radeon_audio.c > +++ b/drivers/gpu/drm/radeon/radeon_audio.c > @@ -576,9 +576,9 @@ static void radeon_audio_calc_cts(unsigned int clock, int *CTS, int *N, int freq > > /* Check that we are in spec (not always possible) */ > if (n < (128*freq/1500)) > - printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); > + pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n"); > if (n > (128*freq/300)) > - printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); > + pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n"); > > *N = n; > *CTS = cts; > diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c > index c1135feb93c1..e55146cdf543 100644 > --- a/drivers/gpu/drm/radeon/radeon_clocks.c > +++ b/drivers/gpu/drm/radeon/radeon_clocks.c > @@ -111,7 +111,7 @@ static bool radeon_read_clocks_OF(struct drm_device *dev) > return false; > val = of_get_property(dp, "ATY,RefCLK", NULL); > if (!val || !*val) { > - printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); > + pr_warn("radeonfb: No ATY,RefCLK property !\n"); > return false; > } > p1pll->reference_freq = p2pll->reference_freq = (*val) / 10; > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c > index 4b0c388be3f5..dde59c36ba92 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -1249,7 +1249,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero > if (state == VGA_SWITCHEROO_ON) { > unsigned d3_delay = dev->pdev->d3_delay; > > - printk(KERN_INFO "radeon: switched on\n"); > + pr_info("radeon: switched on\n"); > /* don't suspend or resume card normally */ > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > > @@ -1263,7 +1263,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero > dev->switch_power_state = DRM_SWITCH_POWER_ON; > drm_kms_helper_poll_enable(dev); > } else { > - printk(KERN_INFO "radeon: switched off\n"); > + pr_info("radeon: switched off\n"); > drm_kms_helper_poll_disable(dev); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > radeon_suspend_kms(dev, true, true, false); > @@ -1410,12 +1410,12 @@ int radeon_device_init(struct radeon_device *rdev, > if (r) { > rdev->need_dma32 = true; > dma_bits = 32; > - printk(KERN_WARNING "radeon: No suitable DMA available.\n"); > + pr_warn("radeon: No suitable DMA available\n"); > } > r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); > if (r) { > pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32)); > - printk(KERN_WARNING "radeon: No coherent DMA available.\n"); > + pr_warn("radeon: No coherent DMA available\n"); > } > > /* Registers mapping */ > diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c > index 2be4fe9c7217..53aa94f705a7 100644 > --- a/drivers/gpu/drm/radeon/radeon_fb.c > +++ b/drivers/gpu/drm/radeon/radeon_fb.c > @@ -149,8 +149,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev, > RADEON_GEM_DOMAIN_VRAM, > 0, true, &gobj); > if (ret) { > - printk(KERN_ERR "failed to allocate framebuffer (%d)\n", > - aligned_size); > + pr_err("failed to allocate framebuffer (%d)\n", aligned_size); > return -ENOMEM; > } > rbo = gem_to_radeon_bo(gobj); > diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c > index 96683f5b2b1b..9b0b123ce079 100644 > --- a/drivers/gpu/drm/radeon/radeon_gem.c > +++ b/drivers/gpu/drm/radeon/radeon_gem.c > @@ -106,7 +106,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, > } > if (!domain) { > /* Do nothings */ > - printk(KERN_WARNING "Set domain without domain !\n"); > + pr_warn("Set domain without domain !\n"); > return 0; > } > if (domain == RADEON_GEM_DOMAIN_CPU) { > @@ -116,7 +116,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, > r = -EBUSY; > > if (r < 0 && r != -EINTR) { > - printk(KERN_ERR "Failed to wait for object: %li\n", r); > + pr_err("Failed to wait for object: %li\n", r); > return r; > } > } > diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c > index 791818165c76..4fdc7bda7a7d 100644 > --- a/drivers/gpu/drm/radeon/radeon_test.c > +++ b/drivers/gpu/drm/radeon/radeon_test.c > @@ -246,7 +246,7 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) > out_cleanup: > kfree(gtt_obj); > if (r) { > - printk(KERN_WARNING "Error while testing BO move.\n"); > + pr_warn("Error while testing BO move\n"); > } > } > > @@ -394,7 +394,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev, > radeon_fence_unref(&fence2); > > if (r) > - printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); > + pr_warn("Error while testing ring sync (%d)\n", r); > } > > static void radeon_test_ring_sync2(struct radeon_device *rdev, > @@ -504,7 +504,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev, > radeon_fence_unref(&fenceB); > > if (r) > - printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); > + pr_warn("Error while testing ring sync (%d)\n", r); > } > > static bool radeon_test_sync_possible(struct radeon_ring *ringA, > diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c > index 34e3235f41d2..4121209c183e 100644 > --- a/drivers/gpu/drm/radeon/rs400.c > +++ b/drivers/gpu/drm/radeon/rs400.c > @@ -255,8 +255,8 @@ static void rs400_gpu_init(struct radeon_device *rdev) > /* FIXME: is this correct ? */ > r420_pipes_init(rdev); > if (rs400_mc_wait_for_idle(rdev)) { > - printk(KERN_WARNING "rs400: Failed to wait MC idle while " > - "programming pipes. Bad things might happen. %08x\n", RREG32(RADEON_MC_STATUS)); > + pr_warn("rs400: Failed to wait MC idle while programming pipes. Bad things might happen. %08x\n", > + RREG32(RADEON_MC_STATUS)); > } > } > > diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c > index 6bc44c24e837..1bae33e43f3c 100644 > --- a/drivers/gpu/drm/radeon/rs690.c > +++ b/drivers/gpu/drm/radeon/rs690.c > @@ -52,8 +52,7 @@ static void rs690_gpu_init(struct radeon_device *rdev) > /* FIXME: is this correct ? */ > r420_pipes_init(rdev); > if (rs690_mc_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait MC idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); > } > } > > diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c > index c55d653aaf5f..ffbd2c006f60 100644 > --- a/drivers/gpu/drm/radeon/rv515.c > +++ b/drivers/gpu/drm/radeon/rv515.c > @@ -154,8 +154,7 @@ static void rv515_gpu_init(struct radeon_device *rdev) > unsigned pipe_select_current, gb_pipe_select, tmp; > > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "resetting GPU. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n"); > } > rv515_vga_render_disable(rdev); > r420_pipes_init(rdev); > @@ -166,12 +165,10 @@ static void rv515_gpu_init(struct radeon_device *rdev) > (((gb_pipe_select >> 8) & 0xF) << 4); > WREG32_PLL(0x000D, tmp); > if (r100_gui_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait GUI idle while " > - "resetting GPU. Bad things might happen.\n"); > + pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n"); > } > if (rv515_mc_wait_for_idle(rdev)) { > - printk(KERN_WARNING "Failed to wait MC idle while " > - "programming pipes. Bad things might happen.\n"); > + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); > } > } > > diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c > index 414776811e71..528e5a49a214 100644 > --- a/drivers/gpu/drm/radeon/si.c > +++ b/drivers/gpu/drm/radeon/si.c > @@ -1762,8 +1762,7 @@ static int si_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->pfp_fw->size != pfp_req_size) { > - printk(KERN_ERR > - "si_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->pfp_fw->size, fw_name); > err = -EINVAL; > goto out; > @@ -1771,8 +1770,7 @@ static int si_init_microcode(struct radeon_device *rdev) > } else { > err = radeon_ucode_validate(rdev->pfp_fw); > if (err) { > - printk(KERN_ERR > - "si_cp: validation failed for firmware \"%s\"\n", > + pr_err("si_cp: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -1788,16 +1786,14 @@ static int si_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->me_fw->size != me_req_size) { > - printk(KERN_ERR > - "si_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->me_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->me_fw); > if (err) { > - printk(KERN_ERR > - "si_cp: validation failed for firmware \"%s\"\n", > + pr_err("si_cp: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -1813,16 +1809,14 @@ static int si_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->ce_fw->size != ce_req_size) { > - printk(KERN_ERR > - "si_cp: Bogus length %zu in firmware \"%s\"\n", > + pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n", > rdev->ce_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->ce_fw); > if (err) { > - printk(KERN_ERR > - "si_cp: validation failed for firmware \"%s\"\n", > + pr_err("si_cp: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -1838,16 +1832,14 @@ static int si_init_microcode(struct radeon_device *rdev) > if (err) > goto out; > if (rdev->rlc_fw->size != rlc_req_size) { > - printk(KERN_ERR > - "si_rlc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n", > rdev->rlc_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->rlc_fw); > if (err) { > - printk(KERN_ERR > - "si_cp: validation failed for firmware \"%s\"\n", > + pr_err("si_cp: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -1871,8 +1863,7 @@ static int si_init_microcode(struct radeon_device *rdev) > } > if ((rdev->mc_fw->size != mc_req_size) && > (rdev->mc_fw->size != mc2_req_size)) { > - printk(KERN_ERR > - "si_mc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n", > rdev->mc_fw->size, fw_name); > err = -EINVAL; > } > @@ -1880,8 +1871,7 @@ static int si_init_microcode(struct radeon_device *rdev) > } else { > err = radeon_ucode_validate(rdev->mc_fw); > if (err) { > - printk(KERN_ERR > - "si_cp: validation failed for firmware \"%s\"\n", > + pr_err("si_cp: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -1900,23 +1890,19 @@ static int si_init_microcode(struct radeon_device *rdev) > snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); > err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); > if (err) { > - printk(KERN_ERR > - "smc: error loading firmware \"%s\"\n", > - fw_name); > + pr_err("smc: error loading firmware \"%s\"\n", fw_name); > release_firmware(rdev->smc_fw); > rdev->smc_fw = NULL; > err = 0; > } else if (rdev->smc_fw->size != smc_req_size) { > - printk(KERN_ERR > - "si_smc: Bogus length %zu in firmware \"%s\"\n", > + pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n", > rdev->smc_fw->size, fw_name); > err = -EINVAL; > } > } else { > err = radeon_ucode_validate(rdev->smc_fw); > if (err) { > - printk(KERN_ERR > - "si_cp: validation failed for firmware \"%s\"\n", > + pr_err("si_cp: validation failed for firmware \"%s\"\n", > fw_name); > goto out; > } else { > @@ -1927,7 +1913,7 @@ static int si_init_microcode(struct radeon_device *rdev) > if (new_fw == 0) { > rdev->new_fw = false; > } else if (new_fw < 6) { > - printk(KERN_ERR "si_fw: mixing new and old firmware!\n"); > + pr_err("si_fw: mixing new and old firmware!\n"); > err = -EINVAL; > } else { > rdev->new_fw = true; > @@ -1935,8 +1921,7 @@ static int si_init_microcode(struct radeon_device *rdev) > out: > if (err) { > if (err != -EINVAL) > - printk(KERN_ERR > - "si_cp: Failed to load firmware \"%s\"\n", > + pr_err("si_cp: Failed to load firmware \"%s\"\n", > fw_name); > release_firmware(rdev->pfp_fw); > rdev->pfp_fw = NULL; > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 17478f38dea3..dca2e809a970 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -982,7 +982,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, > } > > if (!type_found) { > - printk(KERN_ERR TTM_PFX "No compatible memory type found.\n"); > + pr_err(TTM_PFX "No compatible memory type found\n"); > return -EINVAL; > } > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > index 6541dd8b82dc..b399f03a988d 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > @@ -728,8 +728,7 @@ int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data, > > base = ttm_base_object_lookup(tfile, arg->handle); > if (unlikely(base == NULL)) { > - printk(KERN_ERR "Wait invalid fence object handle " > - "0x%08lx.\n", > + pr_err("Wait invalid fence object handle 0x%08lx\n", > (unsigned long)arg->handle); > return -EINVAL; > } > @@ -773,8 +772,7 @@ int vmw_fence_obj_signaled_ioctl(struct drm_device *dev, void *data, > > base = ttm_base_object_lookup(tfile, arg->handle); > if (unlikely(base == NULL)) { > - printk(KERN_ERR "Fence signaled invalid fence object handle " > - "0x%08lx.\n", > + pr_err("Fence signaled invalid fence object handle 0x%08lx\n", > (unsigned long)arg->handle); > return -EINVAL; > } > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > index fec7348cea2c..c1900f4390a4 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > @@ -159,8 +159,7 @@ static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man) > static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man, > const char *prefix) > { > - printk(KERN_INFO "%s: No debug info available for the GMR " > - "id manager.\n", prefix); > + pr_info("%s: No debug info available for the GMR id manager\n", prefix); > } > > const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = { > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > index 65b3f0369636..27033d944b08 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > @@ -736,14 +736,14 @@ int vmw_user_dmabuf_lookup(struct ttm_object_file *tfile, > > base = ttm_base_object_lookup(tfile, handle); > if (unlikely(base == NULL)) { > - printk(KERN_ERR "Invalid buffer object handle 0x%08lx.\n", > + pr_err("Invalid buffer object handle 0x%08lx\n", > (unsigned long)handle); > return -ESRCH; > } > > if (unlikely(ttm_base_object_type(base) != ttm_buffer_type)) { > ttm_base_object_unref(&base); > - printk(KERN_ERR "Invalid buffer object handle 0x%08lx.\n", > + pr_err("Invalid buffer object handle 0x%08lx\n", > (unsigned long)handle); > return -EINVAL; > } > -- > 2.10.0.rc2.1.g053435c > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Broken up for Daniel Vetter Joe Perches (3): gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level> gpu: drm: core: Convert printk(KERN_<LEVEL> to pr_<level> gpu: drm: drivers: Convert printk(KERN_<LEVEL> to pr_<level> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- drivers/gpu/drm/amd/amdgpu/atom.c | 44 ++++++++--------- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +- drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +++--- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 4 +- drivers/gpu/drm/drm_cache.c | 12 ++--- drivers/gpu/drm/drm_edid.c | 4 +- drivers/gpu/drm/drm_ioc32.c | 3 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 ++-- drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +++---- drivers/gpu/drm/gma500/psb_drv.h | 5 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 ++- drivers/gpu/drm/i915/i915_sw_fence.c | 8 ++-- drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-- drivers/gpu/drm/nouveau/nouveau_vga.c | 4 +- drivers/gpu/drm/nouveau/nv50_display.c | 22 ++++----- drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 ++-- drivers/gpu/drm/omapdrm/dss/dsi.c | 17 ++++--- drivers/gpu/drm/omapdrm/dss/dss.c | 3 +- drivers/gpu/drm/omapdrm/dss/dss.h | 15 +++--- drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- drivers/gpu/drm/r128/r128_cce.c | 7 ++- drivers/gpu/drm/radeon/atom.c | 46 ++++++++---------- drivers/gpu/drm/radeon/cik.c | 56 ++++++++-------------- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/evergreen_cs.c | 7 ++- drivers/gpu/drm/radeon/ni.c | 22 +++------ drivers/gpu/drm/radeon/r100.c | 18 +++---- drivers/gpu/drm/radeon/r200.c | 3 +- drivers/gpu/drm/radeon/r300.c | 13 ++--- drivers/gpu/drm/radeon/r420.c | 9 ++-- drivers/gpu/drm/radeon/r520.c | 3 +- drivers/gpu/drm/radeon/r600.c | 21 +++----- drivers/gpu/drm/radeon/r600_cs.c | 7 ++- drivers/gpu/drm/radeon/radeon.h | 3 +- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 +- drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 8 ++-- drivers/gpu/drm/radeon/radeon_fb.c | 3 +- drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/gpu/drm/radeon/radeon_test.c | 6 +-- drivers/gpu/drm/radeon/rs400.c | 4 +- drivers/gpu/drm/radeon/rs690.c | 3 +- drivers/gpu/drm/radeon/rv515.c | 9 ++-- drivers/gpu/drm/radeon/si.c | 45 ++++++----------- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +-- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- 69 files changed, 253 insertions(+), 362 deletions(-)
On Tue, Feb 28, 2017 at 04:55:51AM -0800, Joe Perches wrote: > Broken up for Daniel Vetter Thanks, I applied the core patch (needed a minor resolution in drm_edid.c). I'll wait with the driver patch for a few more acks maybe, and leave the 2 other patches to Alex for picking up directly. Thanks, Daniel > > Joe Perches (3): > gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level> > gpu: drm: core: Convert printk(KERN_<LEVEL> to pr_<level> > gpu: drm: drivers: Convert printk(KERN_<LEVEL> to pr_<level> > > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- > drivers/gpu/drm/amd/amdgpu/atom.c | 44 ++++++++--------- > drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++-- > drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++-- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +- > drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 4 +- > drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- > drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- > drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 4 +- > drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +++--- > .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- > drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 4 +- > drivers/gpu/drm/drm_cache.c | 12 ++--- > drivers/gpu/drm/drm_edid.c | 4 +- > drivers/gpu/drm/drm_ioc32.c | 3 +- > drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 ++-- > drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +++---- > drivers/gpu/drm/gma500/psb_drv.h | 5 +- > drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 ++- > drivers/gpu/drm/i915/i915_sw_fence.c | 8 ++-- > drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- > drivers/gpu/drm/msm/msm_drv.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-- > drivers/gpu/drm/nouveau/nouveau_vga.c | 4 +- > drivers/gpu/drm/nouveau/nv50_display.c | 22 ++++----- > drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 ++-- > drivers/gpu/drm/omapdrm/dss/dsi.c | 17 ++++--- > drivers/gpu/drm/omapdrm/dss/dss.c | 3 +- > drivers/gpu/drm/omapdrm/dss/dss.h | 15 +++--- > drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- > drivers/gpu/drm/r128/r128_cce.c | 7 ++- > drivers/gpu/drm/radeon/atom.c | 46 ++++++++---------- > drivers/gpu/drm/radeon/cik.c | 56 ++++++++-------------- > drivers/gpu/drm/radeon/evergreen.c | 2 +- > drivers/gpu/drm/radeon/evergreen_cs.c | 7 ++- > drivers/gpu/drm/radeon/ni.c | 22 +++------ > drivers/gpu/drm/radeon/r100.c | 18 +++---- > drivers/gpu/drm/radeon/r200.c | 3 +- > drivers/gpu/drm/radeon/r300.c | 13 ++--- > drivers/gpu/drm/radeon/r420.c | 9 ++-- > drivers/gpu/drm/radeon/r520.c | 3 +- > drivers/gpu/drm/radeon/r600.c | 21 +++----- > drivers/gpu/drm/radeon/r600_cs.c | 7 ++- > drivers/gpu/drm/radeon/radeon.h | 3 +- > drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- > drivers/gpu/drm/radeon/radeon_audio.c | 4 +- > drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- > drivers/gpu/drm/radeon/radeon_device.c | 8 ++-- > drivers/gpu/drm/radeon/radeon_fb.c | 3 +- > drivers/gpu/drm/radeon/radeon_gem.c | 4 +- > drivers/gpu/drm/radeon/radeon_test.c | 6 +-- > drivers/gpu/drm/radeon/rs400.c | 4 +- > drivers/gpu/drm/radeon/rs690.c | 3 +- > drivers/gpu/drm/radeon/rv515.c | 9 ++-- > drivers/gpu/drm/radeon/si.c | 45 ++++++----------- > drivers/gpu/drm/ttm/ttm_bo.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +-- > drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- > 69 files changed, 253 insertions(+), 362 deletions(-) > > -- > 2.10.0.rc2.1.g053435c > > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index c1b913541739..3f636632c289 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1515,7 +1515,8 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v); */ #define RREG32(reg) amdgpu_mm_rreg(adev, (reg), false) #define RREG32_IDX(reg) amdgpu_mm_rreg(adev, (reg), true) -#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", amdgpu_mm_rreg(adev, (reg), false)) +#define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n", \ + amdgpu_mm_rreg(adev, (reg), false)) #define WREG32(reg, v) amdgpu_mm_wreg(adev, (reg), (v), false) #define WREG32_IDX(reg, v) amdgpu_mm_wreg(adev, (reg), (v), true) #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c index 857ba0897159..3889486f71fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c @@ -74,9 +74,9 @@ static void amdgpu_afmt_calc_cts(uint32_t clock, int *CTS, int *N, int freq) /* Check that we are in spec (not always possible) */ if (n < (128*freq/1500)) - printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); + pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n"); if (n > (128*freq/300)) - printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); + pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n"); *N = n; *CTS = cts; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c index 6c343a933182..c13c51af0b68 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c @@ -583,8 +583,8 @@ static bool amdgpu_atpx_detect(void) if (has_atpx && vga_count == 2) { acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); - printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", - acpi_method_name); + pr_info("vga_switcheroo: detected switching method %s handle\n", + acpi_method_name); amdgpu_atpx_priv.atpx_detected = true; amdgpu_atpx_priv.bridge_pm_usable = d3_supported; amdgpu_atpx_init(); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 6abb238b25c9..85eeae05ac27 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1059,7 +1059,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero if (state == VGA_SWITCHEROO_ON) { unsigned d3_delay = dev->pdev->d3_delay; - printk(KERN_INFO "amdgpu: switched on\n"); + pr_info("amdgpu: switched on\n"); /* don't suspend or resume card normally */ dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; @@ -1070,7 +1070,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero dev->switch_power_state = DRM_SWITCH_POWER_ON; drm_kms_helper_poll_enable(dev); } else { - printk(KERN_INFO "amdgpu: switched off\n"); + pr_info("amdgpu: switched off\n"); drm_kms_helper_poll_disable(dev); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; amdgpu_device_suspend(dev, true, true); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 36ce3cac81ba..35a287280363 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -150,8 +150,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS, true, &gobj); if (ret) { - printk(KERN_ERR "failed to allocate framebuffer (%d)\n", - aligned_size); + pr_err("failed to allocate framebuffer (%d)\n", aligned_size); return -ENOMEM; } abo = gem_to_amdgpu_bo(gobj); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c index e05a24325eeb..b0483e6e536f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c @@ -228,7 +228,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev) out_cleanup: kfree(gtt_obj); if (r) { - printk(KERN_WARNING "Error while testing BO move.\n"); + pr_warn("Error while testing BO move\n"); } } 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; } diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c index f97ecb49972e..b59e7e5d7279 100644 --- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c @@ -5804,9 +5804,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev) out: if (err) { - printk(KERN_ERR - "cik_smc: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("cik_smc: Failed to load firmware \"%s\"\n", fw_name); release_firmware(adev->pm.fw); adev->pm.fw = NULL; } diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index 810bba533975..c33bc1bb4655 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c @@ -142,9 +142,7 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev) } out: if (err) { - printk(KERN_ERR - "cik_sdma: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name); for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c index 2086e7e68de4..c8f9c1414940 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c @@ -378,9 +378,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev) out: if (err) { - printk(KERN_ERR - "gfx6: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("gfx6: Failed to load firmware \"%s\"\n", fw_name); release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index 1f9354541f29..82c574cf3658 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c @@ -972,9 +972,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev) out: if (err) { - printk(KERN_ERR - "gfx7: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name); release_firmware(adev->gfx.pfp_fw); adev->gfx.pfp_fw = NULL; release_firmware(adev->gfx.me_fw); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index 8d05e0c4e3d7..52594b9fd182 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c @@ -161,9 +161,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) out: if (err) { - printk(KERN_ERR - "cik_mc: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name); release_firmware(adev->mc.fw); adev->mc.fw = NULL; } @@ -938,12 +936,12 @@ static int gmc_v7_0_sw_init(void *handle) if (r) { adev->need_dma32 = true; dma_bits = 32; - printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); + pr_warn("amdgpu: No suitable DMA available\n"); } r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); if (r) { pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); - printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); + pr_warn("amdgpu: No coherent DMA available\n"); } r = gmc_v7_0_init_microcode(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 7669b3259f35..421507aea36a 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -245,9 +245,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) out: if (err) { - printk(KERN_ERR - "mc: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("mc: Failed to load firmware \"%s\"\n", fw_name); release_firmware(adev->mc.fw); adev->mc.fw = NULL; } @@ -950,12 +948,12 @@ static int gmc_v8_0_sw_init(void *handle) if (r) { adev->need_dma32 = true; dma_bits = 32; - printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); + pr_warn("amdgpu: No suitable DMA available\n"); } r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); if (r) { pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); - printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); + pr_warn("amdgpu: No coherent DMA available\n"); } r = gmc_v8_0_init_microcode(adev); diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index 896be64b7013..a881cf475a19 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c @@ -170,9 +170,7 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev) out: if (err) { - printk(KERN_ERR - "sdma_v2_4: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name); for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 011800f621c6..255fab5fceee 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c @@ -321,9 +321,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) } out: if (err) { - printk(KERN_ERR - "sdma_v3_0: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name); for (i = 0; i < adev->sdma.num_instances; i++) { release_firmware(adev->sdma.instance[i].fw); adev->sdma.instance[i].fw = NULL; diff --git a/drivers/gpu/drm/amd/include/amd_pcie_helpers.h b/drivers/gpu/drm/amd/include/amd_pcie_helpers.h index 5725bf85eacc..7e5a965450c7 100644 --- a/drivers/gpu/drm/amd/include/amd_pcie_helpers.h +++ b/drivers/gpu/drm/amd/include/amd_pcie_helpers.h @@ -82,7 +82,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap, switch (pcie_lane_width_cap) { case 0: - printk(KERN_ERR "No valid PCIE lane width reported"); + pr_err("No valid PCIE lane width reported\n"); break; case CAIL_PCIE_LINK_WIDTH_SUPPORT_X1: new_pcie_lanes = 1; @@ -126,7 +126,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap, } } if (j > 7) - printk(KERN_ERR "Cannot find a valid PCIE lane width!"); + pr_err("Cannot find a valid PCIE lane width!\n"); } } break; diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index f75ee33ec5bb..418f87e805b2 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -1544,7 +1544,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr) if (vddc >= 2000 || vddc == 0) return -EINVAL; } else { - pr_warning("failed to retrieving EVV voltage!\n"); + pr_warn("failed to retrieving EVV voltage!\n"); continue; } diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h index 072880130cfb..f3f9ebb631a5 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h @@ -37,7 +37,7 @@ #define PP_ASSERT_WITH_CODE(cond, msg, code) \ do { \ if (!(cond)) { \ - pr_warning("%s\n", msg); \ + pr_warn("%s\n", msg); \ code; \ } \ } while (0) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c index 0f7a77b7312e..5450f5ef8e89 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c @@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member) return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold); } } - pr_warning("can't get the offset of type %x member %x\n", type, member); + pr_warn("can't get the offset of type %x member %x\n", type, member); return 0; } @@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value) return SMU73_MAX_LEVELS_MVDD; } - pr_warning("can't get the mac of %x\n", value); + pr_warn("can't get the mac of %x\n", value); return 0; } diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c index ad82161df831..b609ab7e9b97 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c @@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr) break; default: smu_data->power_tune_defaults = &defaults_iceland; - pr_warning("Unknown V.I. Device ID.\n"); + pr_warn("Unknown V.I. Device ID\n"); break; } return; @@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, return -EINVAL); if (NULL == hwmgr->dyn_state.cac_leakage_table) { - pr_warning("CAC Leakage Table does not exist, using vddc.\n"); + pr_warn("CAC Leakage Table does not exist, using vddc\n"); return 0; } @@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE; *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE); } else { - pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n"); + pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table\n"); *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE; *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE); } @@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE; *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE; } else { - pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table."); + pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table\n"); *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE; *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE); } @@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr, } if (!vol_found) - pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n"); + pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc\n"); } return 0; @@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member) return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold); } } - pr_warning("can't get the offset of type %x member %x\n", type, member); + pr_warn("can't get the offset of type %x member %x\n", type, member); return 0; } @@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value) return SMU71_MAX_LEVELS_MVDD; } - pr_warning("can't get the mac of %x\n", value); + pr_warn("can't get the mac of %x\n", value); return 0; } diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c index 80e2329a1b9e..c9ca7a1ac171 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c @@ -2184,7 +2184,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member) return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold); } } - pr_warning("can't get the offset of type %x member %x\n", type, member); + pr_warn("can't get the offset of type %x member %x\n", type, member); return 0; } @@ -2211,7 +2211,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value) return SMU7_UVD_MCLK_HANDSHAKE_DISABLE; } - pr_warning("can't get the mac of %x\n", value); + pr_warn("can't get the mac of %x\n", value); return 0; } diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c index 331b0aba4a13..4d1439a498eb 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c @@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member) return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold); } } - pr_warning("can't get the offset of type %x member %x\n", type, member); + pr_warn("can't get the offset of type %x member %x\n", type, member); return 0; } @@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value) case SMU_MAX_LEVELS_MVDD: return SMU72_MAX_LEVELS_MVDD; } - pr_warning("can't get the mac value %x\n", value); + pr_warn("can't get the mac value %x\n", value); return 0; } diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c index c3b9aaccdf42..3bd76e918b5d 100644 --- a/drivers/gpu/drm/drm_cache.c +++ b/drivers/gpu/drm/drm_cache.c @@ -88,7 +88,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) } if (wbinvd_on_all_cpus()) - printk(KERN_ERR "Timed out waiting for cache flush.\n"); + pr_err("Timed out waiting for cache flush\n"); #elif defined(__powerpc__) unsigned long i; @@ -105,7 +105,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) kunmap_atomic(page_virtual); } #else - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); + pr_err("Architecture has no drm_cache.c support\n"); WARN_ON_ONCE(1); #endif } @@ -134,9 +134,9 @@ drm_clflush_sg(struct sg_table *st) } if (wbinvd_on_all_cpus()) - printk(KERN_ERR "Timed out waiting for cache flush.\n"); + pr_err("Timed out waiting for cache flush\n"); #else - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); + pr_err("Architecture has no drm_cache.c support\n"); WARN_ON_ONCE(1); #endif } @@ -167,9 +167,9 @@ drm_clflush_virt_range(void *addr, unsigned long length) } if (wbinvd_on_all_cpus()) - printk(KERN_ERR "Timed out waiting for cache flush.\n"); + pr_err("Timed out waiting for cache flush\n"); #else - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); + pr_err("Architecture has no drm_cache.c support\n"); WARN_ON_ONCE(1); #endif } diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index c8baab9bee0d..ca4f054f71b2 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1164,9 +1164,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, bad: if (print_bad_edid) { if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) { - printk(KERN_ERR "EDID block is all zeroes\n"); + pr_err("EDID block is all zeroes\n"); } else { - printk(KERN_ERR "Raw EDID:\n"); + pr_err("Raw EDID:\n"); print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1, raw_edid, EDID_LENGTH, false); } diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 867ab8c1582b..b134482f4022 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -257,8 +257,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, m32.handle = (unsigned long)handle; if (m32.handle != (unsigned long)handle) - printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle" - " %p for type %d offset %x\n", + pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n", handle, m32.type, m32.offset); if (copy_to_user(argp, &m32, sizeof(m32))) diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c index 5efdb7fbb7ee..e64960db3224 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c @@ -284,8 +284,7 @@ static bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder, head) { if (tmp_encoder != encoder && tmp_encoder->crtc == encoder->crtc) { - printk(KERN_ERR "Can't enable LVDS and another " - "encoder on the same pipe\n"); + pr_err("Can't enable LVDS and another encoder on the same pipe\n"); return false; } } @@ -756,13 +755,13 @@ void cdv_intel_lvds_init(struct drm_device *dev, failed_find: mutex_unlock(&dev->mode_config.mutex); - printk(KERN_ERR "Failed find\n"); + pr_err("Failed find\n"); psb_intel_i2c_destroy(gma_encoder->ddc_bus); failed_ddc: - printk(KERN_ERR "Failed DDC\n"); + pr_err("Failed DDC\n"); psb_intel_i2c_destroy(gma_encoder->i2c_bus); failed_blc_i2c: - printk(KERN_ERR "Failed BLC\n"); + pr_err("Failed BLC\n"); drm_encoder_cleanup(encoder); drm_connector_cleanup(connector); kfree(lvds_priv); diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c index f7038f12ac76..e6943fef0611 100644 --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c @@ -255,15 +255,15 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev, ((ti->vblank_hi << 8) | ti->vblank_lo); mode->clock = ti->pixel_clock * 10; #if 0 - printk(KERN_INFO "hdisplay is %d\n", mode->hdisplay); - printk(KERN_INFO "vdisplay is %d\n", mode->vdisplay); - printk(KERN_INFO "HSS is %d\n", mode->hsync_start); - printk(KERN_INFO "HSE is %d\n", mode->hsync_end); - printk(KERN_INFO "htotal is %d\n", mode->htotal); - printk(KERN_INFO "VSS is %d\n", mode->vsync_start); - printk(KERN_INFO "VSE is %d\n", mode->vsync_end); - printk(KERN_INFO "vtotal is %d\n", mode->vtotal); - printk(KERN_INFO "clock is %d\n", mode->clock); + pr_info("hdisplay is %d\n", mode->hdisplay); + pr_info("vdisplay is %d\n", mode->vdisplay); + pr_info("HSS is %d\n", mode->hsync_start); + pr_info("HSE is %d\n", mode->hsync_end); + pr_info("htotal is %d\n", mode->htotal); + pr_info("VSS is %d\n", mode->vsync_start); + pr_info("VSE is %d\n", mode->vsync_end); + pr_info("vtotal is %d\n", mode->vtotal); + pr_info("clock is %d\n", mode->clock); #endif mode_dev->panel_fixed_mode = mode; } diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 83e22fd4cfc0..83667087d6e5 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -905,9 +905,8 @@ static inline void REGISTER_WRITE8(struct drm_device *dev, #define PSB_RSGX32(_offs) \ ({ \ if (inl(dev_priv->apm_base + PSB_APM_STS) & 0x3) { \ - printk(KERN_ERR \ - "access sgx when it's off!! (READ) %s, %d\n", \ - __FILE__, __LINE__); \ + pr_err("access sgx when it's off!! (READ) %s, %d\n", \ + __FILE__, __LINE__); \ melay(1000); \ } \ ioread32(dev_priv->sgx_reg + (_offs)); \ diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c index 483fdce74e39..0066fe7e622e 100644 --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c @@ -388,11 +388,11 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, /* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */ if (!IS_MRST(dev) && gma_crtc->pipe == 0) { - printk(KERN_ERR "Can't support LVDS on pipe A\n"); + pr_err("Can't support LVDS on pipe A\n"); return false; } if (IS_MRST(dev) && gma_crtc->pipe != 0) { - printk(KERN_ERR "Must use PIPE A\n"); + pr_err("Must use PIPE A\n"); return false; } /* Should never happen!! */ @@ -400,8 +400,7 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, head) { if (tmp_encoder != encoder && tmp_encoder->crtc == encoder->crtc) { - printk(KERN_ERR "Can't enable LVDS and another " - "encoder on the same pipe\n"); + pr_err("Can't enable LVDS and another encoder on the same pipe\n"); return false; } } diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index 40f4e5efaf83..a277f8eb7beb 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -395,10 +395,10 @@ static void timer_i915_sw_fence_wake(unsigned long data) { struct i915_sw_dma_fence_cb *cb = (struct i915_sw_dma_fence_cb *)data; - printk(KERN_WARNING "asynchronous wait on fence %s:%s:%x timed out\n", - cb->dma->ops->get_driver_name(cb->dma), - cb->dma->ops->get_timeline_name(cb->dma), - cb->dma->seqno); + pr_warn("asynchronous wait on fence %s:%s:%x timed out\n", + cb->dma->ops->get_driver_name(cb->dma), + cb->dma->ops->get_timeline_name(cb->dma), + cb->dma->seqno); dma_fence_put(cb->dma); cb->dma = NULL; diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 3938120e5051..f2e9b2bc18a5 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -195,7 +195,7 @@ static int mga_g200se_set_plls(struct mga_device *mdev, long clock) } if (delta > permitteddelta) { - printk(KERN_WARNING "PLL delta too large\n"); + pr_warn("PLL delta too large\n"); return 1; } diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 70226eaa5cac..462e7d5bd872 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -152,7 +152,7 @@ u32 msm_readl(const void __iomem *addr) { u32 val = readl(addr); if (reglog) - printk(KERN_ERR "IO:R %p %08x\n", addr, val); + pr_err("IO:R %p %08x\n", addr, val); return val; } diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 193573d191e5..39468c218027 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c @@ -326,7 +326,7 @@ static bool nouveau_dsm_detect(void) nouveau_dsm_priv.dhandle = dhandle; acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, &buffer); - printk(KERN_INFO "VGA switcheroo: detected Optimus DSM method %s handle\n", + pr_info("VGA switcheroo: detected Optimus DSM method %s handle\n", acpi_method_name); if (has_power_resources) pr_info("nouveau: detected PR support, will not use DSM\n"); @@ -338,7 +338,7 @@ static bool nouveau_dsm_detect(void) nouveau_dsm_priv.dhandle = dhandle; acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, &buffer); - printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n", + pr_info("VGA switcheroo: detected DSM switching method %s handle\n", acpi_method_name); nouveau_dsm_priv.dsm_detected = true; ret = true; @@ -406,7 +406,8 @@ static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios, status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer); if (ACPI_FAILURE(status)) { - printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status)); + pr_info("failed to evaluate ROM got %s\n", + acpi_format_exception(status)); return -ENODEV; } obj = (union acpi_object *)buffer.pointer; diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index eef22c6b9665..ccb597eac538 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -41,13 +41,13 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev, return; if (state == VGA_SWITCHEROO_ON) { - printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); + pr_err("VGA switcheroo: switched nouveau on\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; nouveau_pmops_resume(&pdev->dev); drm_kms_helper_poll_enable(dev); dev->switch_power_state = DRM_SWITCH_POWER_ON; } else { - printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); + pr_err("VGA switcheroo: switched nouveau off\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; drm_kms_helper_poll_disable(dev); nouveau_switcheroo_optimus_dsm(); diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 0b4440ffbeae..ff7437b2762d 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -705,7 +705,7 @@ evo_wait(void *evoc, int nr) break; ) < 0) { mutex_unlock(&dmac->lock); - printk(KERN_ERR "nouveau: evo channel stalled\n"); + pr_err("nouveau: evo channel stalled\n"); return NULL; } @@ -723,18 +723,18 @@ evo_kick(u32 *push, void *evoc) mutex_unlock(&dmac->lock); } -#define evo_mthd(p,m,s) do { \ - const u32 _m = (m), _s = (s); \ - if (drm_debug & DRM_UT_KMS) \ - printk(KERN_ERR "%04x %d %s\n", _m, _s, __func__); \ - *((p)++) = ((_s << 18) | _m); \ +#define evo_mthd(p, m, s) do { \ + const u32 _m = (m), _s = (s); \ + if (drm_debug & DRM_UT_KMS) \ + pr_err("%04x %d %s\n", _m, _s, __func__); \ + *((p)++) = ((_s << 18) | _m); \ } while(0) -#define evo_data(p,d) do { \ - const u32 _d = (d); \ - if (drm_debug & DRM_UT_KMS) \ - printk(KERN_ERR "\t%08x\n", _d); \ - *((p)++) = _d; \ +#define evo_data(p, d) do { \ + const u32 _d = (d); \ + if (drm_debug & DRM_UT_KMS) \ + pr_err("\t%08x\n", _d); \ + *((p)++) = _d; \ } while(0) /****************************************************************************** diff --git a/drivers/gpu/drm/nouveau/nvkm/core/mm.c b/drivers/gpu/drm/nouveau/nvkm/core/mm.c index fd19d652a7ab..5c7891234eea 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/mm.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/mm.c @@ -31,15 +31,15 @@ nvkm_mm_dump(struct nvkm_mm *mm, const char *header) { struct nvkm_mm_node *node; - printk(KERN_ERR "nvkm: %s\n", header); - printk(KERN_ERR "nvkm: node list:\n"); + pr_err("nvkm: %s\n", header); + pr_err("nvkm: node list:\n"); list_for_each_entry(node, &mm->nodes, nl_entry) { - printk(KERN_ERR "nvkm: \t%08x %08x %d\n", + pr_err("nvkm: \t%08x %08x %d\n", node->offset, node->length, node->type); } - printk(KERN_ERR "nvkm: free list:\n"); + pr_err("nvkm: free list:\n"); list_for_each_entry(node, &mm->free, fl_entry) { - printk(KERN_ERR "nvkm: \t%08x %08x %d\n", + pr_err("nvkm: \t%08x %08x %d\n", node->offset, node->length, node->type); } } diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index f74615d005a8..5e51a5649efb 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -582,15 +582,14 @@ static void dsi_perf_show(struct platform_device *dsidev, const char *name) total_bytes = dsi->update_bytes; - printk(KERN_INFO "DSI(%s): %u us + %u us = %u us (%uHz), " - "%u bytes, %u kbytes/sec\n", - name, - setup_us, - trans_us, - total_us, - 1000*1000 / total_us, - total_bytes, - total_bytes * 1000 / total_us); + pr_info("DSI(%s): %u us + %u us = %u us (%uHz), %u bytes, %u kbytes/sec\n", + name, + setup_us, + trans_us, + total_us, + 1000 * 1000 / total_us, + total_bytes, + total_bytes * 1000 / total_us); } #else static inline void dsi_perf_mark_setup(struct platform_device *dsidev) diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 14887d5b02e5..4e72d2fefb4d 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1254,8 +1254,7 @@ static int dss_bind(struct device *dev) dss.lcd_clk_source[1] = DSS_CLK_SRC_FCK; rev = dss_read_reg(DSS_REVISION); - printk(KERN_INFO "OMAP DSS rev %d.%d\n", - FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); + pr_info("OMAP DSS rev %d.%d\n", FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); dss_runtime_put(); diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h index 56493b290731..78f6fc75948b 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.h +++ b/drivers/gpu/drm/omapdrm/dss/dss.h @@ -42,29 +42,26 @@ #ifdef DSS_SUBSYS_NAME #define DSSERR(format, ...) \ - printk(KERN_ERR "omapdss " DSS_SUBSYS_NAME " error: " format, \ - ## __VA_ARGS__) + pr_err("omapdss " DSS_SUBSYS_NAME " error: " format, ##__VA_ARGS__) #else #define DSSERR(format, ...) \ - printk(KERN_ERR "omapdss error: " format, ## __VA_ARGS__) + pr_err("omapdss error: " format, ##__VA_ARGS__) #endif #ifdef DSS_SUBSYS_NAME #define DSSINFO(format, ...) \ - printk(KERN_INFO "omapdss " DSS_SUBSYS_NAME ": " format, \ - ## __VA_ARGS__) + pr_info("omapdss " DSS_SUBSYS_NAME ": " format, ##__VA_ARGS__) #else #define DSSINFO(format, ...) \ - printk(KERN_INFO "omapdss: " format, ## __VA_ARGS__) + pr_info("omapdss: " format, ## __VA_ARGS__) #endif #ifdef DSS_SUBSYS_NAME #define DSSWARN(format, ...) \ - printk(KERN_WARNING "omapdss " DSS_SUBSYS_NAME ": " format, \ - ## __VA_ARGS__) + pr_warn("omapdss " DSS_SUBSYS_NAME ": " format, ##__VA_ARGS__) #else #define DSSWARN(format, ...) \ - printk(KERN_WARNING "omapdss: " format, ## __VA_ARGS__) + pr_warn("omapdss: " format, ##__VA_ARGS__) #endif /* OMAP TRM gives bitfields as start:end, where start is the higher bit diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 5d5a9f517c30..68a75b829b71 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -1107,9 +1107,8 @@ static inline bool is_waiting(struct omap_gem_sync_waiter *waiter) /* macro for sync debug.. */ #define SYNCDBG 0 -#define SYNC(fmt, ...) do { if (SYNCDBG) \ - printk(KERN_ERR "%s:%d: "fmt"\n", \ - __func__, __LINE__, ##__VA_ARGS__); \ +#define SYNC(fmt, ...) do { if (SYNCDBG) \ + pr_err("%s:%d: " fmt "\n", __func__, __LINE__, ##__VA_ARGS__); \ } while (0) diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index 14fd83b5f497..c9890afe69d6 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c @@ -149,20 +149,19 @@ static int r128_cce_load_microcode(drm_r128_private_t *dev_priv) pdev = platform_device_register_simple("r128_cce", 0, NULL, 0); if (IS_ERR(pdev)) { - printk(KERN_ERR "r128_cce: Failed to register firmware\n"); + pr_err("r128_cce: Failed to register firmware\n"); return PTR_ERR(pdev); } rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); platform_device_unregister(pdev); if (rc) { - printk(KERN_ERR "r128_cce: Failed to load firmware \"%s\"\n", + pr_err("r128_cce: Failed to load firmware \"%s\"\n", FIRMWARE_NAME); return rc; } if (fw->size != 256 * 8) { - printk(KERN_ERR - "r128_cce: Bogus length %zu in firmware \"%s\"\n", + pr_err("r128_cce: Bogus length %zu in firmware \"%s\"\n", fw->size, FIRMWARE_NAME); rc = -EINVAL; goto out_release; diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index f66c33dd21a3..6a2e091aa7b6 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -170,7 +170,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; } } @@ -194,22 +194,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 = @@ -473,22 +470,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], @@ -819,17 +813,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) @@ -992,7 +986,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; @@ -1026,7 +1020,7 @@ static void atom_op_xor(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_debug(atom_exec_context *ctx, int *ptr, int arg) { - printk(KERN_INFO "unimplemented!\n"); + pr_info("unimplemented!\n"); } static struct { @@ -1280,14 +1274,14 @@ struct atom_context *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; } @@ -1296,7 +1290,7 @@ struct atom_context *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; } @@ -1320,7 +1314,7 @@ struct atom_context *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; } diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index f6ff41a0eed6..b338d58e281f 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -2069,8 +2069,7 @@ static int cik_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->pfp_fw->size != pfp_req_size) { - printk(KERN_ERR - "cik_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", rdev->pfp_fw->size, fw_name); err = -EINVAL; goto out; @@ -2078,8 +2077,7 @@ static int cik_init_microcode(struct radeon_device *rdev) } else { err = radeon_ucode_validate(rdev->pfp_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2095,16 +2093,14 @@ static int cik_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->me_fw->size != me_req_size) { - printk(KERN_ERR - "cik_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->me_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2120,16 +2116,14 @@ static int cik_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->ce_fw->size != ce_req_size) { - printk(KERN_ERR - "cik_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", rdev->ce_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->ce_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2145,16 +2139,14 @@ static int cik_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->mec_fw->size != mec_req_size) { - printk(KERN_ERR - "cik_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n", rdev->mec_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->mec_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2185,16 +2177,14 @@ static int cik_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->rlc_fw->size != rlc_req_size) { - printk(KERN_ERR - "cik_rlc: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_rlc: Bogus length %zu in firmware \"%s\"\n", rdev->rlc_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->rlc_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2210,16 +2200,14 @@ static int cik_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->sdma_fw->size != sdma_req_size) { - printk(KERN_ERR - "cik_sdma: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_sdma: Bogus length %zu in firmware \"%s\"\n", rdev->sdma_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->sdma_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2242,8 +2230,7 @@ static int cik_init_microcode(struct radeon_device *rdev) } if ((rdev->mc_fw->size != mc_req_size) && (rdev->mc_fw->size != mc2_req_size)){ - printk(KERN_ERR - "cik_mc: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_mc: Bogus length %zu in firmware \"%s\"\n", rdev->mc_fw->size, fw_name); err = -EINVAL; } @@ -2251,8 +2238,7 @@ static int cik_init_microcode(struct radeon_device *rdev) } else { err = radeon_ucode_validate(rdev->mc_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2269,23 +2255,20 @@ static int cik_init_microcode(struct radeon_device *rdev) snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); if (err) { - printk(KERN_ERR - "smc: error loading firmware \"%s\"\n", + pr_err("smc: error loading firmware \"%s\"\n", fw_name); release_firmware(rdev->smc_fw); rdev->smc_fw = NULL; err = 0; } else if (rdev->smc_fw->size != smc_req_size) { - printk(KERN_ERR - "cik_smc: Bogus length %zu in firmware \"%s\"\n", + pr_err("cik_smc: Bogus length %zu in firmware \"%s\"\n", rdev->smc_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->smc_fw); if (err) { - printk(KERN_ERR - "cik_fw: validation failed for firmware \"%s\"\n", + pr_err("cik_fw: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -2297,7 +2280,7 @@ static int cik_init_microcode(struct radeon_device *rdev) if (new_fw == 0) { rdev->new_fw = false; } else if (new_fw < num_fw) { - printk(KERN_ERR "ci_fw: mixing new and old firmware!\n"); + pr_err("ci_fw: mixing new and old firmware!\n"); err = -EINVAL; } else { rdev->new_fw = true; @@ -2306,8 +2289,7 @@ static int cik_init_microcode(struct radeon_device *rdev) out: if (err) { if (err != -EINVAL) - printk(KERN_ERR - "cik_cp: Failed to load firmware \"%s\"\n", + pr_err("cik_cp: Failed to load firmware \"%s\"\n", fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 0b6b5766216f..d1b1e0cc3c25 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2486,7 +2486,7 @@ void evergreen_pcie_gart_tlb_flush(struct radeon_device *rdev) tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; if (tmp == 2) { - printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); + pr_warn("[drm] r600 flush TLB failed\n"); return; } if (tmp) { diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index f8b05090232a..54324330b91f 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -1061,8 +1061,7 @@ static int evergreen_packet0_check(struct radeon_cs_parser *p, } break; default: - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", - reg, idx); + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); return -EINVAL; } return 0; @@ -2776,7 +2775,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) } while (p->idx < p->chunk_ib->length_dw); #if 0 for (r = 0; r < p->ib.length_dw; r++) { - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); mdelay(1); } #endif @@ -3215,7 +3214,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p) } while (p->idx < p->chunk_ib->length_dw); #if 0 for (r = 0; r < p->ib->length_dw; r++) { - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); mdelay(1); } #endif diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index a0d4a0522fdc..9eccd0c81d88 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -774,8 +774,7 @@ int ni_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->pfp_fw->size != pfp_req_size) { - printk(KERN_ERR - "ni_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n", rdev->pfp_fw->size, fw_name); err = -EINVAL; goto out; @@ -786,8 +785,7 @@ int ni_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->me_fw->size != me_req_size) { - printk(KERN_ERR - "ni_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); err = -EINVAL; } @@ -797,8 +795,7 @@ int ni_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->rlc_fw->size != rlc_req_size) { - printk(KERN_ERR - "ni_rlc: Bogus length %zu in firmware \"%s\"\n", + pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n", rdev->rlc_fw->size, fw_name); err = -EINVAL; } @@ -810,8 +807,7 @@ int ni_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->mc_fw->size != mc_req_size) { - printk(KERN_ERR - "ni_mc: Bogus length %zu in firmware \"%s\"\n", + pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n", rdev->mc_fw->size, fw_name); err = -EINVAL; } @@ -821,15 +817,12 @@ int ni_init_microcode(struct radeon_device *rdev) snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); if (err) { - printk(KERN_ERR - "smc: error loading firmware \"%s\"\n", - fw_name); + pr_err("smc: error loading firmware \"%s\"\n", fw_name); release_firmware(rdev->smc_fw); rdev->smc_fw = NULL; err = 0; } else if (rdev->smc_fw->size != smc_req_size) { - printk(KERN_ERR - "ni_mc: Bogus length %zu in firmware \"%s\"\n", + pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n", rdev->mc_fw->size, fw_name); err = -EINVAL; } @@ -838,8 +831,7 @@ int ni_init_microcode(struct radeon_device *rdev) out: if (err) { if (err != -EINVAL) - printk(KERN_ERR - "ni_cp: Failed to load firmware \"%s\"\n", + pr_err("ni_cp: Failed to load firmware \"%s\"\n", fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index e3399310d41d..aefca0b03f38 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1042,11 +1042,9 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); if (err) { - printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", - fw_name); + pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name); } else if (rdev->me_fw->size % 8) { - printk(KERN_ERR - "radeon_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); err = -EINVAL; release_firmware(rdev->me_fw); @@ -1087,8 +1085,7 @@ static void r100_cp_load_microcode(struct radeon_device *rdev) int i, size; if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } if (rdev->me_fw) { @@ -1246,8 +1243,7 @@ void r100_cp_disable(struct radeon_device *rdev) WREG32(RADEON_CP_CSQ_CNTL, 0); WREG32(R_000770_SCRATCH_UMSK, 0); if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } } @@ -1881,8 +1877,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, track->tex_dirty = true; break; default: - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", - reg, idx); + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); return -EINVAL; } return 0; @@ -2486,8 +2481,7 @@ int r100_gui_wait_for_idle(struct radeon_device *rdev) uint32_t tmp; if (r100_rbbm_fifo_wait_for_entry(rdev, 64)) { - printk(KERN_WARNING "radeon: wait for empty RBBM fifo failed !" - " Bad things might happen.\n"); + pr_warn("radeon: wait for empty RBBM fifo failed! Bad things might happen.\n"); } for (i = 0; i < rdev->usec_timeout; i++) { tmp = RREG32(RADEON_RBBM_STATUS); diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c index c70e6d5bcd19..c22321cc5a41 100644 --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c @@ -537,8 +537,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, track->tex_dirty = true; break; default: - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", - reg, idx); + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); return -EINVAL; } return 0; diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 7e417d8dc733..21161aa8acbf 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -387,8 +387,7 @@ static void r300_gpu_init(struct radeon_device *rdev) WREG32(R300_GB_TILE_CONFIG, gb_tile_config); if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } tmp = RREG32(R300_DST_PIPE_CONFIG); @@ -399,14 +398,12 @@ static void r300_gpu_init(struct radeon_device *rdev) R300_DC_DC_DISABLE_IGNORE_PE); if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } if (r300_mc_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait MC idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); } - DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized.\n", + DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized\n", rdev->num_gb_pipes, rdev->num_z_pipes); } @@ -1165,7 +1162,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, } return 0; fail: - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d (val=%08x)\n", + pr_err("Forbidden register 0x%04X in cs at %d (val=%08x)\n", reg, idx, idx_value); return -EINVAL; } diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index 2828605aef3f..3eb0c4f9f796 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c @@ -92,8 +92,7 @@ void r420_pipes_init(struct radeon_device *rdev) (1 << 2) | (1 << 3)); /* add idle wait as per freedesktop.org bug 24041 */ if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } /* get max number of pipes */ gb_pipe_select = RREG32(R400_GB_PIPE_SELECT); @@ -128,8 +127,7 @@ void r420_pipes_init(struct radeon_device *rdev) tmp |= R300_TILE_SIZE_16 | R300_ENABLE_TILING; WREG32(R300_GB_TILE_CONFIG, tmp); if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } tmp = RREG32(R300_DST_PIPE_CONFIG); @@ -141,8 +139,7 @@ void r420_pipes_init(struct radeon_device *rdev) R300_DC_DC_DISABLE_IGNORE_PE); if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n"); } if (rdev->family == CHIP_RV530) { diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 98d6053c36c6..074cf752faef 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c @@ -86,8 +86,7 @@ static void r520_gpu_init(struct radeon_device *rdev) (((gb_pipe_select >> 8) & 0xF) << 4); WREG32_PLL(0x000D, tmp); if (r520_mc_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait MC idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); } } diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index a951881c2a50..0a085176e79b 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1094,7 +1094,7 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev) tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; if (tmp == 2) { - printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); + pr_warn("[drm] r600 flush TLB failed\n"); return; } if (tmp) { @@ -2550,8 +2550,7 @@ int r600_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->pfp_fw->size != pfp_req_size) { - printk(KERN_ERR - "r600_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n", rdev->pfp_fw->size, fw_name); err = -EINVAL; goto out; @@ -2562,8 +2561,7 @@ int r600_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->me_fw->size != me_req_size) { - printk(KERN_ERR - "r600_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); err = -EINVAL; } @@ -2573,8 +2571,7 @@ int r600_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->rlc_fw->size != rlc_req_size) { - printk(KERN_ERR - "r600_rlc: Bogus length %zu in firmware \"%s\"\n", + pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n", rdev->rlc_fw->size, fw_name); err = -EINVAL; } @@ -2583,15 +2580,12 @@ int r600_init_microcode(struct radeon_device *rdev) snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); if (err) { - printk(KERN_ERR - "smc: error loading firmware \"%s\"\n", - fw_name); + pr_err("smc: error loading firmware \"%s\"\n", fw_name); release_firmware(rdev->smc_fw); rdev->smc_fw = NULL; err = 0; } else if (rdev->smc_fw->size != smc_req_size) { - printk(KERN_ERR - "smc: Bogus length %zu in firmware \"%s\"\n", + pr_err("smc: Bogus length %zu in firmware \"%s\"\n", rdev->smc_fw->size, fw_name); err = -EINVAL; } @@ -2600,8 +2594,7 @@ int r600_init_microcode(struct radeon_device *rdev) out: if (err) { if (err != -EINVAL) - printk(KERN_ERR - "r600_cp: Failed to load firmware \"%s\"\n", + pr_err("r600_cp: Failed to load firmware \"%s\"\n", fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 595a19736458..97fd58e97043 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -932,8 +932,7 @@ static int r600_packet0_check(struct radeon_cs_parser *p, } break; default: - printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", - reg, idx); + pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx); return -EINVAL; } return 0; @@ -2320,7 +2319,7 @@ int r600_cs_parse(struct radeon_cs_parser *p) } while (p->idx < p->chunk_ib->length_dw); #if 0 for (r = 0; r < p->ib.length_dw; r++) { - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); mdelay(1); } #endif @@ -2528,7 +2527,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p) } while (p->idx < p->chunk_ib->length_dw); #if 0 for (r = 0; r < p->ib->length_dw; r++) { - printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); + pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]); mdelay(1); } #endif diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 44e0c5ed6418..2e400dc414e3 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -2535,7 +2535,8 @@ static inline struct radeon_fence *to_radeon_fence(struct dma_fence *f) #define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg)) #define RREG32(reg) r100_mm_rreg(rdev, (reg), false) #define RREG32_IDX(reg) r100_mm_rreg(rdev, (reg), true) -#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg), false)) +#define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n", \ + r100_mm_rreg(rdev, (reg), false)) #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v), false) #define WREG32_IDX(reg, v) r100_mm_wreg(rdev, (reg), (v), true) #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index 0ae13cd2adda..40be4068ca69 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c @@ -577,8 +577,8 @@ static bool radeon_atpx_detect(void) if (has_atpx && vga_count == 2) { acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); - printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", - acpi_method_name); + pr_info("vga_switcheroo: detected switching method %s handle\n", + acpi_method_name); radeon_atpx_priv.atpx_detected = true; radeon_atpx_priv.bridge_pm_usable = d3_supported; radeon_atpx_init(); diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index b214663b370d..aaacac190d26 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -576,9 +576,9 @@ static void radeon_audio_calc_cts(unsigned int clock, int *CTS, int *N, int freq /* Check that we are in spec (not always possible) */ if (n < (128*freq/1500)) - printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); + pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n"); if (n > (128*freq/300)) - printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); + pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n"); *N = n; *CTS = cts; diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c index c1135feb93c1..e55146cdf543 100644 --- a/drivers/gpu/drm/radeon/radeon_clocks.c +++ b/drivers/gpu/drm/radeon/radeon_clocks.c @@ -111,7 +111,7 @@ static bool radeon_read_clocks_OF(struct drm_device *dev) return false; val = of_get_property(dp, "ATY,RefCLK", NULL); if (!val || !*val) { - printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); + pr_warn("radeonfb: No ATY,RefCLK property !\n"); return false; } p1pll->reference_freq = p2pll->reference_freq = (*val) / 10; diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 4b0c388be3f5..dde59c36ba92 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1249,7 +1249,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero if (state == VGA_SWITCHEROO_ON) { unsigned d3_delay = dev->pdev->d3_delay; - printk(KERN_INFO "radeon: switched on\n"); + pr_info("radeon: switched on\n"); /* don't suspend or resume card normally */ dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; @@ -1263,7 +1263,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero dev->switch_power_state = DRM_SWITCH_POWER_ON; drm_kms_helper_poll_enable(dev); } else { - printk(KERN_INFO "radeon: switched off\n"); + pr_info("radeon: switched off\n"); drm_kms_helper_poll_disable(dev); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; radeon_suspend_kms(dev, true, true, false); @@ -1410,12 +1410,12 @@ int radeon_device_init(struct radeon_device *rdev, if (r) { rdev->need_dma32 = true; dma_bits = 32; - printk(KERN_WARNING "radeon: No suitable DMA available.\n"); + pr_warn("radeon: No suitable DMA available\n"); } r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); if (r) { pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32)); - printk(KERN_WARNING "radeon: No coherent DMA available.\n"); + pr_warn("radeon: No coherent DMA available\n"); } /* Registers mapping */ diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 2be4fe9c7217..53aa94f705a7 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -149,8 +149,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev, RADEON_GEM_DOMAIN_VRAM, 0, true, &gobj); if (ret) { - printk(KERN_ERR "failed to allocate framebuffer (%d)\n", - aligned_size); + pr_err("failed to allocate framebuffer (%d)\n", aligned_size); return -ENOMEM; } rbo = gem_to_radeon_bo(gobj); diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 96683f5b2b1b..9b0b123ce079 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -106,7 +106,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, } if (!domain) { /* Do nothings */ - printk(KERN_WARNING "Set domain without domain !\n"); + pr_warn("Set domain without domain !\n"); return 0; } if (domain == RADEON_GEM_DOMAIN_CPU) { @@ -116,7 +116,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj, r = -EBUSY; if (r < 0 && r != -EINTR) { - printk(KERN_ERR "Failed to wait for object: %li\n", r); + pr_err("Failed to wait for object: %li\n", r); return r; } } diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c index 791818165c76..4fdc7bda7a7d 100644 --- a/drivers/gpu/drm/radeon/radeon_test.c +++ b/drivers/gpu/drm/radeon/radeon_test.c @@ -246,7 +246,7 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) out_cleanup: kfree(gtt_obj); if (r) { - printk(KERN_WARNING "Error while testing BO move.\n"); + pr_warn("Error while testing BO move\n"); } } @@ -394,7 +394,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev, radeon_fence_unref(&fence2); if (r) - printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); + pr_warn("Error while testing ring sync (%d)\n", r); } static void radeon_test_ring_sync2(struct radeon_device *rdev, @@ -504,7 +504,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev, radeon_fence_unref(&fenceB); if (r) - printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); + pr_warn("Error while testing ring sync (%d)\n", r); } static bool radeon_test_sync_possible(struct radeon_ring *ringA, diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index 34e3235f41d2..4121209c183e 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c @@ -255,8 +255,8 @@ static void rs400_gpu_init(struct radeon_device *rdev) /* FIXME: is this correct ? */ r420_pipes_init(rdev); if (rs400_mc_wait_for_idle(rdev)) { - printk(KERN_WARNING "rs400: Failed to wait MC idle while " - "programming pipes. Bad things might happen. %08x\n", RREG32(RADEON_MC_STATUS)); + pr_warn("rs400: Failed to wait MC idle while programming pipes. Bad things might happen. %08x\n", + RREG32(RADEON_MC_STATUS)); } } diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 6bc44c24e837..1bae33e43f3c 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -52,8 +52,7 @@ static void rs690_gpu_init(struct radeon_device *rdev) /* FIXME: is this correct ? */ r420_pipes_init(rdev); if (rs690_mc_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait MC idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); } } diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index c55d653aaf5f..ffbd2c006f60 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -154,8 +154,7 @@ static void rv515_gpu_init(struct radeon_device *rdev) unsigned pipe_select_current, gb_pipe_select, tmp; if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "resetting GPU. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n"); } rv515_vga_render_disable(rdev); r420_pipes_init(rdev); @@ -166,12 +165,10 @@ static void rv515_gpu_init(struct radeon_device *rdev) (((gb_pipe_select >> 8) & 0xF) << 4); WREG32_PLL(0x000D, tmp); if (r100_gui_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait GUI idle while " - "resetting GPU. Bad things might happen.\n"); + pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n"); } if (rv515_mc_wait_for_idle(rdev)) { - printk(KERN_WARNING "Failed to wait MC idle while " - "programming pipes. Bad things might happen.\n"); + pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n"); } } diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 414776811e71..528e5a49a214 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -1762,8 +1762,7 @@ static int si_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->pfp_fw->size != pfp_req_size) { - printk(KERN_ERR - "si_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n", rdev->pfp_fw->size, fw_name); err = -EINVAL; goto out; @@ -1771,8 +1770,7 @@ static int si_init_microcode(struct radeon_device *rdev) } else { err = radeon_ucode_validate(rdev->pfp_fw); if (err) { - printk(KERN_ERR - "si_cp: validation failed for firmware \"%s\"\n", + pr_err("si_cp: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -1788,16 +1786,14 @@ static int si_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->me_fw->size != me_req_size) { - printk(KERN_ERR - "si_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n", rdev->me_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->me_fw); if (err) { - printk(KERN_ERR - "si_cp: validation failed for firmware \"%s\"\n", + pr_err("si_cp: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -1813,16 +1809,14 @@ static int si_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->ce_fw->size != ce_req_size) { - printk(KERN_ERR - "si_cp: Bogus length %zu in firmware \"%s\"\n", + pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n", rdev->ce_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->ce_fw); if (err) { - printk(KERN_ERR - "si_cp: validation failed for firmware \"%s\"\n", + pr_err("si_cp: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -1838,16 +1832,14 @@ static int si_init_microcode(struct radeon_device *rdev) if (err) goto out; if (rdev->rlc_fw->size != rlc_req_size) { - printk(KERN_ERR - "si_rlc: Bogus length %zu in firmware \"%s\"\n", + pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n", rdev->rlc_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->rlc_fw); if (err) { - printk(KERN_ERR - "si_cp: validation failed for firmware \"%s\"\n", + pr_err("si_cp: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -1871,8 +1863,7 @@ static int si_init_microcode(struct radeon_device *rdev) } if ((rdev->mc_fw->size != mc_req_size) && (rdev->mc_fw->size != mc2_req_size)) { - printk(KERN_ERR - "si_mc: Bogus length %zu in firmware \"%s\"\n", + pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n", rdev->mc_fw->size, fw_name); err = -EINVAL; } @@ -1880,8 +1871,7 @@ static int si_init_microcode(struct radeon_device *rdev) } else { err = radeon_ucode_validate(rdev->mc_fw); if (err) { - printk(KERN_ERR - "si_cp: validation failed for firmware \"%s\"\n", + pr_err("si_cp: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -1900,23 +1890,19 @@ static int si_init_microcode(struct radeon_device *rdev) snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); if (err) { - printk(KERN_ERR - "smc: error loading firmware \"%s\"\n", - fw_name); + pr_err("smc: error loading firmware \"%s\"\n", fw_name); release_firmware(rdev->smc_fw); rdev->smc_fw = NULL; err = 0; } else if (rdev->smc_fw->size != smc_req_size) { - printk(KERN_ERR - "si_smc: Bogus length %zu in firmware \"%s\"\n", + pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n", rdev->smc_fw->size, fw_name); err = -EINVAL; } } else { err = radeon_ucode_validate(rdev->smc_fw); if (err) { - printk(KERN_ERR - "si_cp: validation failed for firmware \"%s\"\n", + pr_err("si_cp: validation failed for firmware \"%s\"\n", fw_name); goto out; } else { @@ -1927,7 +1913,7 @@ static int si_init_microcode(struct radeon_device *rdev) if (new_fw == 0) { rdev->new_fw = false; } else if (new_fw < 6) { - printk(KERN_ERR "si_fw: mixing new and old firmware!\n"); + pr_err("si_fw: mixing new and old firmware!\n"); err = -EINVAL; } else { rdev->new_fw = true; @@ -1935,8 +1921,7 @@ static int si_init_microcode(struct radeon_device *rdev) out: if (err) { if (err != -EINVAL) - printk(KERN_ERR - "si_cp: Failed to load firmware \"%s\"\n", + pr_err("si_cp: Failed to load firmware \"%s\"\n", fw_name); release_firmware(rdev->pfp_fw); rdev->pfp_fw = NULL; diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 17478f38dea3..dca2e809a970 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -982,7 +982,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, } if (!type_found) { - printk(KERN_ERR TTM_PFX "No compatible memory type found.\n"); + pr_err(TTM_PFX "No compatible memory type found\n"); return -EINVAL; } diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index 6541dd8b82dc..b399f03a988d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -728,8 +728,7 @@ int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data, base = ttm_base_object_lookup(tfile, arg->handle); if (unlikely(base == NULL)) { - printk(KERN_ERR "Wait invalid fence object handle " - "0x%08lx.\n", + pr_err("Wait invalid fence object handle 0x%08lx\n", (unsigned long)arg->handle); return -EINVAL; } @@ -773,8 +772,7 @@ int vmw_fence_obj_signaled_ioctl(struct drm_device *dev, void *data, base = ttm_base_object_lookup(tfile, arg->handle); if (unlikely(base == NULL)) { - printk(KERN_ERR "Fence signaled invalid fence object handle " - "0x%08lx.\n", + pr_err("Fence signaled invalid fence object handle 0x%08lx\n", (unsigned long)arg->handle); return -EINVAL; } diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c index fec7348cea2c..c1900f4390a4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c @@ -159,8 +159,7 @@ static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man) static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man, const char *prefix) { - printk(KERN_INFO "%s: No debug info available for the GMR " - "id manager.\n", prefix); + pr_info("%s: No debug info available for the GMR id manager\n", prefix); } const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = { diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 65b3f0369636..27033d944b08 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -736,14 +736,14 @@ int vmw_user_dmabuf_lookup(struct ttm_object_file *tfile, base = ttm_base_object_lookup(tfile, handle); if (unlikely(base == NULL)) { - printk(KERN_ERR "Invalid buffer object handle 0x%08lx.\n", + pr_err("Invalid buffer object handle 0x%08lx\n", (unsigned long)handle); return -ESRCH; } if (unlikely(ttm_base_object_type(base) != ttm_buffer_type)) { ttm_base_object_unref(&base); - printk(KERN_ERR "Invalid buffer object handle 0x%08lx.\n", + pr_err("Invalid buffer object handle 0x%08lx\n", (unsigned long)handle); return -EINVAL; }
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> --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 2 +- drivers/gpu/drm/amd/amdgpu/atom.c | 44 ++++++++--------- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++-- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +- drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +++--- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 4 +- drivers/gpu/drm/drm_cache.c | 12 ++--- drivers/gpu/drm/drm_edid.c | 4 +- drivers/gpu/drm/drm_ioc32.c | 3 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 ++-- drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +++---- drivers/gpu/drm/gma500/psb_drv.h | 5 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 ++- drivers/gpu/drm/i915/i915_sw_fence.c | 8 ++-- drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-- drivers/gpu/drm/nouveau/nouveau_vga.c | 4 +- drivers/gpu/drm/nouveau/nv50_display.c | 22 ++++----- drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 ++-- drivers/gpu/drm/omapdrm/dss/dsi.c | 17 ++++--- drivers/gpu/drm/omapdrm/dss/dss.c | 3 +- drivers/gpu/drm/omapdrm/dss/dss.h | 15 +++--- drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- drivers/gpu/drm/r128/r128_cce.c | 7 ++- drivers/gpu/drm/radeon/atom.c | 46 ++++++++---------- drivers/gpu/drm/radeon/cik.c | 56 ++++++++-------------- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/evergreen_cs.c | 7 ++- drivers/gpu/drm/radeon/ni.c | 22 +++------ drivers/gpu/drm/radeon/r100.c | 18 +++---- drivers/gpu/drm/radeon/r200.c | 3 +- drivers/gpu/drm/radeon/r300.c | 13 ++--- drivers/gpu/drm/radeon/r420.c | 9 ++-- drivers/gpu/drm/radeon/r520.c | 3 +- drivers/gpu/drm/radeon/r600.c | 21 +++----- drivers/gpu/drm/radeon/r600_cs.c | 7 ++- drivers/gpu/drm/radeon/radeon.h | 3 +- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 +- drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 8 ++-- drivers/gpu/drm/radeon/radeon_fb.c | 3 +- drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/gpu/drm/radeon/radeon_test.c | 6 +-- drivers/gpu/drm/radeon/rs400.c | 4 +- drivers/gpu/drm/radeon/rs690.c | 3 +- drivers/gpu/drm/radeon/rv515.c | 9 ++-- drivers/gpu/drm/radeon/si.c | 45 ++++++----------- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +-- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- 69 files changed, 253 insertions(+), 362 deletions(-)