lkml.org 
[lkml]   [2011]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2 v3] ramoops: add new line to each print
    From: Marco Stornelli <marco.stornelli@gmail.com>

    Add new line to each print.

    Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
    CC: Kyungmin Park <kyungmin.park@samsung.com>
    CC: Américo Wang <xiyou.wangcong@gmail.com>
    CC: Joe Perches <joe@perches.com>
    Reported-by: Stevie Trujillo <stevie.trujillo@gmail.com>
    ---
    ChangeLog:
    - v3: removed double line from pr_info
    - v2: used pr_<level> instead of printk
    - v1: initial draft

    diff --git a/drivers/char/ramoops.c b/drivers/char/ramoops.c
    index df092e1..5b4a5e1 100644
    --- a/drivers/char/ramoops.c
    +++ b/drivers/char/ramoops.c
    @@ -19,6 +19,8 @@
    *
    */

    +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
    +
    #include <linux/kernel.h>
    #include <linux/module.h>
    #include <linux/kmsg_dump.h>
    @@ -111,14 +113,14 @@ static int __init ramoops_probe(struct platform_device *pdev)
    int err = -EINVAL;

    if (!pdata->mem_size) {
    - printk(KERN_ERR "ramoops: invalid size specification");
    + pr_err("invalid size specification\n");
    goto fail3;
    }

    rounddown_pow_of_two(pdata->mem_size);

    if (pdata->mem_size < RECORD_SIZE) {
    - printk(KERN_ERR "ramoops: size too small");
    + pr_err("size too small\n");
    goto fail3;
    }

    @@ -128,21 +130,21 @@ static int __init ramoops_probe(struct platform_device *pdev)
    cxt->phys_addr = pdata->mem_address;

    if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) {
    - printk(KERN_ERR "ramoops: request mem region failed");
    + pr_err("request mem region failed\n");
    err = -EINVAL;
    goto fail3;
    }

    cxt->virt_addr = ioremap(cxt->phys_addr, cxt->size);
    if (!cxt->virt_addr) {
    - printk(KERN_ERR "ramoops: ioremap failed");
    + pr_err("ioremap failed\n");
    goto fail2;
    }

    cxt->dump.dump = ramoops_do_dump;
    err = kmsg_dump_register(&cxt->dump);
    if (err) {
    - printk(KERN_ERR "ramoops: registering kmsg dumper failed");
    + pr_err("registering kmsg dumper failed\n");
    goto fail1;
    }

    @@ -161,7 +163,7 @@ static int __exit ramoops_remove(struct platform_device *pdev)
    struct ramoops_context *cxt = &oops_cxt;

    if (kmsg_dump_unregister(&cxt->dump) < 0)
    - printk(KERN_WARNING "ramoops: could not unregister kmsg_dumper");
    + pr_warn("could not unregister kmsg_dumper\n");

    iounmap(cxt->virt_addr);
    release_mem_region(cxt->phys_addr, cxt->size);
    @@ -186,6 +188,7 @@ static int __init ramoops_init(void)
    * if we didn't find a platform device, we use module parameters
    * building platform data on the fly.
    */
    + pr_info("platform device not found, using module parameters\n");
    dummy_data = kzalloc(sizeof(struct ramoops_platform_data),
    GFP_KERNEL);
    if (!dummy_data)
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2011-06-08 21:55    [W:0.049 / U:92.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site