From patchwork Mon Oct 8 12:06:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 10630485 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8455616B1 for ; Mon, 8 Oct 2018 12:06:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71C9D28AF4 for ; Mon, 8 Oct 2018 12:06:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 630C028B04; Mon, 8 Oct 2018 12:06:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C157528AF4 for ; Mon, 8 Oct 2018 12:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727657AbeJHTST (ORCPT ); Mon, 8 Oct 2018 15:18:19 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36936 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727434AbeJHTST (ORCPT ); Mon, 8 Oct 2018 15:18:19 -0400 Received: by mail-wr1-f68.google.com with SMTP id y11-v6so9802972wrd.4 for ; Mon, 08 Oct 2018 05:06:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=p4FT5E2sCBvinfPrAT966+v95TtAZJAQIPQYOPSL49I=; b=pDsRqC17fMg82mrvq2FqGqfzD6ruWKeheaoKxPSSk6wItDcpU+aQ+2IhNKZuaKMyqt HA/L8LY5+/JialE2uqN4P1BsQuSuyOVTg5BGjpV2l3fME/N5K7dYVYTwlFQPZStGBVqr a8stpQCxxIX8MEHKmhj3YPyZ61aPUEjAn1IbQxeK1pmC9ofiyAOc+9fb0CRLs+xdoEOa qbgjwhJ6vZrLsmOlg8rqP52UWLIXdTXPQSAXm1/mzHXMtzokJ3HX7B8URCusPPvX6P3F EAj5OmdqkjzFTb2tEFYZvc0woiICM87ZtzVw9dn44HXi5l6deN5uXLZw6s7yfDjGLhdK 0duA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p4FT5E2sCBvinfPrAT966+v95TtAZJAQIPQYOPSL49I=; b=bC72f+NK6Cm50OvwalnCJmvvOn7JnNPg8avyo0QepIGjn2u+EO24HRzISuo5ZlDjnC QGeYEVrJ3jcwr+Nafak41WbdcUwhn48/liZHtDj0PqPb/JzV+3BW7YD06mKEU0dPrv9R HWr+HevS8u+2Ab35iMiAmtvMdFmb6jK1+m35mPgGh/eT91YKvd7KbbSijkrph/6WUDPb jBm2dZTyuMWHhoVaacG5jjsrsdoNc14vpwDxwXW3kOrggOZwDsyM8wIW7FcECXOjqo5m 8IBm6xIi6vEIlvoLaqMOeAypwEoz6BtY+EsVSWTFeRHQTatf/Jb7zoBTybbKklAr7NQe G7IQ== X-Gm-Message-State: ABuFfojxFTQGROMvZoBEffPKBhY+9P84/Q0tAGJ7RdMu5cuoP0OqdX+W bLDNsU+lBkfXGKByR/TNrYw= X-Google-Smtp-Source: ACcGV62w6bl/AFK0hG/YjaJDclLjLXTcrDZy8OeoLHHLTpu9aGGSqh6N7npqCdHevXUnaDjctNxOxg== X-Received: by 2002:adf:ac4a:: with SMTP id v68-v6mr17164806wrc.165.1539000412076; Mon, 08 Oct 2018 05:06:52 -0700 (PDT) Received: from vdoo.wework.com ([82.166.68.50]) by smtp.gmail.com with ESMTPSA id w4-v6sm37788552wra.83.2018.10.08.05.06.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 05:06:51 -0700 (PDT) From: Dafna Hirschfeld To: isely@pobox.com, mchehab@kernel.org, helen.koike@collabora.com, hverkuil@xs4all.nl Cc: outreachy-kernel@googlegroups.com, dafna3@gmail.com, Linux Media Mailing List Subject: [PATCH vicodec] media: pvrusb2: replace `printk` with `pr_*` Date: Mon, 8 Oct 2018 15:06:47 +0300 Message-Id: <20181008120647.10271-1-dafna3@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace calls to `printk` with the appropriate `pr_*` macro. Signed-off-by: Dafna Hirschfeld --- drivers/media/usb/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +++--- drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 28 +++++++++----------- drivers/media/usb/pvrusb2/pvrusb2-main.c | 4 +-- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/media/usb/pvrusb2/pvrusb2-debug.h b/drivers/media/usb/pvrusb2/pvrusb2-debug.h index 5cd16292e2fa..1323f949f454 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-debug.h +++ b/drivers/media/usb/pvrusb2/pvrusb2-debug.h @@ -17,7 +17,7 @@ extern int pvrusb2_debug; -#define pvr2_trace(msk, fmt, arg...) do {if(msk & pvrusb2_debug) printk(KERN_INFO "pvrusb2: " fmt "\n", ##arg); } while (0) +#define pvr2_trace(msk, fmt, arg...) do {if (msk & pvrusb2_debug) pr_info("pvrusb2: " fmt "\n", ##arg); } while (0) /* These are listed in *rough* order of decreasing usefulness and increasing noise level. */ diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index a8519da0020b..7702285c1519 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -3293,12 +3293,12 @@ void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw) int nr = pvr2_hdw_get_unit_number(hdw); LOCK_TAKE(hdw->big_lock); do { - printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); + pr_info("pvrusb2: ================= START STATUS CARD #%d =================\n", nr); v4l2_device_call_all(&hdw->v4l2_dev, 0, core, log_status); pvr2_trace(PVR2_TRACE_INFO,"cx2341x config:"); cx2341x_log_status(&hdw->enc_ctl_state, "pvrusb2"); pvr2_hdw_state_log_state(hdw); - printk(KERN_INFO "pvrusb2: ================== END STATUS CARD #%d ==================\n", nr); + pr_info("pvrusb2: ================== END STATUS CARD #%d ==================\n", nr); } while (0); LOCK_GIVE(hdw->big_lock); } @@ -4851,7 +4851,7 @@ static void pvr2_hdw_state_log_state(struct pvr2_hdw *hdw) for (idx = 0; ; idx++) { ccnt = pvr2_hdw_report_unlocked(hdw,idx,buf,sizeof(buf)); if (!ccnt) break; - printk(KERN_INFO "%s %.*s\n",hdw->name,ccnt,buf); + pr_info("%s %.*s\n", hdw->name, ccnt, buf); } ccnt = pvr2_hdw_report_clients(hdw, buf, sizeof(buf)); if (ccnt >= sizeof(buf)) @@ -4863,7 +4863,7 @@ static void pvr2_hdw_state_log_state(struct pvr2_hdw *hdw) while ((lcnt + ucnt < ccnt) && (buf[lcnt + ucnt] != '\n')) { lcnt++; } - printk(KERN_INFO "%s %.*s\n", hdw->name, lcnt, buf + ucnt); + pr_info("%s %.*s\n", hdw->name, lcnt, buf + ucnt); ucnt += lcnt + 1; } } diff --git a/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c index ec7d32759e39..8f023085c2d9 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c @@ -478,8 +478,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, unsigned int idx,offs,cnt; for (idx = 0; idx < num; idx++) { cnt = msgs[idx].len; - printk(KERN_INFO - "pvrusb2 i2c xfer %u/%u: addr=0x%x len=%d %s", + pr_info("pvrusb2 i2c xfer %u/%u: addr=0x%x len=%d %s", idx+1,num, msgs[idx].addr, cnt, @@ -487,22 +486,21 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, "read" : "write")); if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) { if (cnt > 8) cnt = 8; - printk(KERN_CONT " ["); + pr_cont(" ["); for (offs = 0; offs < cnt; offs++) { - if (offs) printk(KERN_CONT " "); - printk(KERN_CONT "%02x",msgs[idx].buf[offs]); + if (offs) pr_cont(" "); + pr_cont("%02x", msgs[idx].buf[offs]); } - if (offs < cnt) printk(KERN_CONT " ..."); - printk(KERN_CONT "]"); + if (offs < cnt) pr_cont(" ..."); + pr_cont("]"); } if (idx+1 == num) { - printk(KERN_CONT " result=%d",ret); + pr_cont(" result=%d", ret); } - printk(KERN_CONT "\n"); + pr_cont("\n"); } if (!num) { - printk(KERN_INFO - "pvrusb2 i2c xfer null transfer result=%d\n", + pr_info("pvrusb2 i2c xfer null transfer result=%d\n", ret); } } @@ -542,14 +540,14 @@ static int do_i2c_probe(struct pvr2_hdw *hdw, int addr) static void do_i2c_scan(struct pvr2_hdw *hdw) { int i; - printk(KERN_INFO "%s: i2c scan beginning\n", hdw->name); + pr_info("%s: i2c scan beginning\n", hdw->name); for (i = 0; i < 128; i++) { if (do_i2c_probe(hdw, i)) { - printk(KERN_INFO "%s: i2c scan: found device @ 0x%x\n", + pr_info("%s: i2c scan: found device @ 0x%x\n", hdw->name, i); } } - printk(KERN_INFO "%s: i2c scan done.\n", hdw->name); + pr_info("%s: i2c scan done.\n", hdw->name); } static void pvr2_i2c_register_ir(struct pvr2_hdw *hdw) @@ -612,7 +610,7 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw) /* However, deal with various special cases for 24xxx hardware. */ if (ir_mode[hdw->unit_number] == 0) { - printk(KERN_INFO "%s: IR disabled\n",hdw->name); + pr_info("%s: IR disabled\n", hdw->name); hdw->i2c_func[0x18] = i2c_black_hole; } else if (ir_mode[hdw->unit_number] == 1) { if (hdw->ir_scheme_active == PVR2_IR_SCHEME_24XXX) { diff --git a/drivers/media/usb/pvrusb2/pvrusb2-main.c b/drivers/media/usb/pvrusb2/pvrusb2-main.c index cbe2c3a22458..23672dd352f5 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-main.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-main.c @@ -132,10 +132,10 @@ static int __init pvr_init(void) ret = usb_register(&pvr_driver); if (ret == 0) - printk(KERN_INFO "pvrusb2: " DRIVER_VERSION ":" + pr_info("pvrusb2: " DRIVER_VERSION ":" DRIVER_DESC "\n"); if (pvrusb2_debug) - printk(KERN_INFO "pvrusb2: Debug mask is %d (0x%x)\n", + pr_info("pvrusb2: Debug mask is %d (0x%x)\n", pvrusb2_debug,pvrusb2_debug); pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete"); diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c index cea232a3302d..97a93ed4bcda 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c @@ -869,7 +869,7 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) are gone. */ video_unregister_device(&dip->devbase); - printk(KERN_INFO "%s\n", msg); + pr_info("%s\n", msg); } @@ -1260,7 +1260,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, ": Failed to register pvrusb2 v4l device\n"); } - printk(KERN_INFO "pvrusb2: registered device %s [%s]\n", + pr_info("pvrusb2: registered device %s [%s]\n", video_device_node_name(&dip->devbase), pvr2_config_get_name(dip->config));