lkml.org 
[lkml]   [2014]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] w1: use pr_* instead of printk
    Date
    This patch replaces all calls to the "printk" function within the main "w1"
    directory by calls to the appropriate "pr_*" function thus addressing
    the following warning generated by the checkpatch script:

    WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ...
    then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...

    Signed-off-by: Fjodor Schelichow <fjodor.schelichow@hotmail.com>
    Signed-off-by: Roman Sommer <romsom2@yahoo.de>
    ---
    drivers/w1/w1.c | 10 ++++------
    drivers/w1/w1_family.c | 2 +-
    drivers/w1/w1_int.c | 9 ++++-----
    drivers/w1/w1_log.h | 4 ++--
    drivers/w1/w1_netlink.c | 3 +--
    5 files changed, 12 insertions(+), 16 deletions(-)

    diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
    index 5d73415..592f7ed 100644
    --- a/drivers/w1/w1.c
    +++ b/drivers/w1/w1.c
    @@ -1162,28 +1162,26 @@ static int __init w1_init(void)
    {
    int retval;

    - printk(KERN_INFO "Driver for 1-wire Dallas network protocol.\n");
    + pr_info("Driver for 1-wire Dallas network protocol.\n");

    w1_init_netlink();

    retval = bus_register(&w1_bus_type);
    if (retval) {
    - printk(KERN_ERR "Failed to register bus. err=%d.\n", retval);
    + pr_err("Failed to register bus. err=%d.\n", retval);
    goto err_out_exit_init;
    }

    retval = driver_register(&w1_master_driver);
    if (retval) {
    - printk(KERN_ERR
    - "Failed to register master driver. err=%d.\n",
    + pr_err("Failed to register master driver. err=%d.\n",
    retval);
    goto err_out_bus_unregister;
    }

    retval = driver_register(&w1_slave_driver);
    if (retval) {
    - printk(KERN_ERR
    - "Failed to register slave driver. err=%d.\n",
    + pr_err("Failed to register slave driver. err=%d.\n",
    retval);
    goto err_out_master_unregister;
    }
    diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
    index 3651ec8..1dc3051 100644
    --- a/drivers/w1/w1_family.c
    +++ b/drivers/w1/w1_family.c
    @@ -87,7 +87,7 @@ void w1_unregister_family(struct w1_family *fent)
    w1_reconnect_slaves(fent, 0);

    while (atomic_read(&fent->refcnt)) {
    - printk(KERN_INFO "Waiting for family %u to become free: refcnt=%d.\n",
    + pr_info("Waiting for family %u to become free: refcnt=%d.\n",
    fent->fid, atomic_read(&fent->refcnt));

    if (msleep_interruptible(1000))
    diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
    index 728039d2..5e470ab 100644
    --- a/drivers/w1/w1_int.c
    +++ b/drivers/w1/w1_int.c
    @@ -50,8 +50,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
    */
    dev = kzalloc(sizeof(struct w1_master) + sizeof(struct w1_bus_master), GFP_KERNEL);
    if (!dev) {
    - printk(KERN_ERR
    - "Failed to allocate %zd bytes for new w1 device.\n",
    + pr_err("Failed to allocate %zd bytes for new w1 device.\n",
    sizeof(struct w1_master));
    return NULL;
    }
    @@ -91,7 +90,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,

    err = device_register(&dev->dev);
    if (err) {
    - printk(KERN_ERR "Failed to register master device. err=%d\n", err);
    + pr_err("Failed to register master device. err=%d\n", err);
    memset(dev, 0, sizeof(struct w1_master));
    kfree(dev);
    dev = NULL;
    @@ -120,7 +119,7 @@ int w1_add_master_device(struct w1_bus_master *master)
    if (!(master->touch_bit && master->reset_bus) &&
    !(master->write_bit && master->read_bit) &&
    !(master->write_byte && master->read_byte && master->reset_bus)) {
    - printk(KERN_ERR "w1_add_master_device: invalid function set\n");
    + pr_err("w1_add_master_device: invalid function set\n");
    return(-EINVAL);
    }

    @@ -254,7 +253,7 @@ void w1_remove_master_device(struct w1_bus_master *bm)
    }

    if (!found) {
    - printk(KERN_ERR "Device doesn't exist.\n");
    + pr_err("Device doesn't exist.\n");
    return;
    }

    diff --git a/drivers/w1/w1_log.h b/drivers/w1/w1_log.h
    index 9c7bd62..f9eecff 100644
    --- a/drivers/w1/w1_log.h
    +++ b/drivers/w1/w1_log.h
    @@ -29,8 +29,8 @@
    #else
    # define assert(expr) \
    if(unlikely(!(expr))) { \
    - printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \
    - #expr, __FILE__, __func__, __LINE__); \
    + pr_err("Assertion failed! %s,%s,%s,line=%d\n", \
    + #expr, __FILE__, __func__, __LINE__); \
    }
    #endif

    diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c
    index 351a297..dd96562 100644
    --- a/drivers/w1/w1_netlink.c
    +++ b/drivers/w1/w1_netlink.c
    @@ -680,8 +680,7 @@ static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
    if (sl)
    dev = sl->master;
    } else {
    - printk(KERN_NOTICE
    - "%s: cn: %x.%x, wrong type: %u, len: %u.\n",
    + pr_notice("%s: cn: %x.%x, wrong type: %u, len: %u.\n",
    __func__, cn->id.idx, cn->id.val,
    msg->type, msg->len);
    err = -EPROTO;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-06-19 03:41    [W:5.049 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site