Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3cb3ec2c26473d8123a468abfaca1e926344b1c2
Commit:     3cb3ec2c26473d8123a468abfaca1e926344b1c2
Parent:     258de4badd5b7b5d168307638f755bd4df16c18e
Author:     Grant Likely <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 4 10:48:36 2007 -0600
Committer:  Grant Likely <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 18:11:20 2007 -0600

    [POWERPC] XilinxFB: Replace calls to printk with dev_dbg, dev_err, etc.
    
    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 <[EMAIL PROTECTED]>
    Acked-by: Andrei Konovalov <[EMAIL PROTECTED]>
---
 drivers/video/xilinxfb.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 1a5f1e4..e63cbd1 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -18,6 +18,7 @@
  * Geert Uytterhoeven.
  */
 
+#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
@@ -214,7 +215,7 @@ 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);
@@ -222,14 +223,13 @@ xilinxfb_drv_probe(struct device *dev)
        /* 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;
@@ -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;
        }
@@ -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;
@@ -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;
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to