Skip to content

Commit

Permalink
[POWERPC] XilinxFB: Replace calls to printk with dev_dbg, dev_err, etc.
Browse files Browse the repository at this point in the history
The dev_dbg, dev_err, etc functions provide more context that plain
vanilla printk which is useful for debugging.  Where appropriate,
change printk calls to the appropriate dev_*() call.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
  • Loading branch information
Grant Likely committed Oct 10, 2007
1 parent 258de4b commit 3cb3ec2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/video/xilinxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* Geert Uytterhoeven.
*/

#include <linux/device.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/version.h>
Expand Down Expand Up @@ -214,22 +215,21 @@ xilinxfb_drv_probe(struct device *dev)

drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
if (!drvdata) {
printk(KERN_ERR "Couldn't allocate device private record\n");
dev_err(dev, "Couldn't allocate device private record\n");
return -ENOMEM;
}
dev_set_drvdata(dev, drvdata);

/* Map the control registers in */
regs_res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!regs_res || (regs_res->end - regs_res->start + 1 < 8)) {
printk(KERN_ERR "Couldn't get registers resource\n");
dev_err(dev, "Couldn't get registers resource\n");
retval = -EFAULT;
goto failed1;
}

if (!request_mem_region(regs_res->start, 8, DRIVER_NAME)) {
printk(KERN_ERR
"Couldn't lock memory region at 0x%08X\n",
dev_err(dev, "Couldn't lock memory region at 0x%08X\n",
regs_res->start);
retval = -EBUSY;
goto failed1;
Expand All @@ -241,7 +241,7 @@ xilinxfb_drv_probe(struct device *dev)
drvdata->fb_virt = dma_alloc_coherent(dev, PAGE_ALIGN(FB_SIZE),
&drvdata->fb_phys, GFP_KERNEL);
if (!drvdata->fb_virt) {
printk(KERN_ERR "Could not allocate frame buffer memory\n");
dev_err(dev, "Could not allocate frame buffer memory\n");
retval = -ENOMEM;
goto failed2;
}
Expand All @@ -267,7 +267,7 @@ xilinxfb_drv_probe(struct device *dev)
drvdata->info.pseudo_palette = drvdata->pseudo_palette;

if (fb_alloc_cmap(&drvdata->info.cmap, PALETTE_ENTRIES_NO, 0) < 0) {
printk(KERN_ERR "Fail to allocate colormap (%d entries)\n",
dev_err(dev, "Fail to allocate colormap (%d entries)\n",
PALETTE_ENTRIES_NO);
retval = -EFAULT;
goto failed3;
Expand All @@ -282,7 +282,7 @@ xilinxfb_drv_probe(struct device *dev)

/* Register new frame buffer */
if (register_framebuffer(&drvdata->info) < 0) {
printk(KERN_ERR "Could not register frame buffer\n");
dev_err(dev, "Could not register frame buffer\n");
retval = -EINVAL;
goto failed4;
}
Expand Down

0 comments on commit 3cb3ec2

Please sign in to comment.