From patchwork Sun Feb 22 16:11:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 5862111 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9829B9F37F for ; Sun, 22 Feb 2015 16:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DF5E205B3 for ; Sun, 22 Feb 2015 16:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7880920592 for ; Sun, 22 Feb 2015 16:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070AbbBVQLy (ORCPT ); Sun, 22 Feb 2015 11:11:54 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:48101 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857AbbBVQLw (ORCPT ); Sun, 22 Feb 2015 11:11:52 -0500 Received: from [186.222.155.130] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1YPZ8J-0005NX-4l; Sun, 22 Feb 2015 16:11:51 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.84) (envelope-from ) id 1YPZ8A-0004Ya-B4; Sun, 22 Feb 2015 13:11:42 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab Subject: [PATCH 03/10] [media] siano: replace sms_warn() by pr_warn() Date: Sun, 22 Feb 2015 13:11:34 -0300 Message-Id: <1424621501-17466-4-git-send-email-mchehab@osg.samsung.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424621501-17466-1-git-send-email-mchehab@osg.samsung.com> References: <1424621501-17466-1-git-send-email-mchehab@osg.samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There's no reason for a sms' own sms_warn macro. Just replace it by the standard pr_warn(). Signed-off-by: Mauro Carvalho Chehab --- drivers/media/common/siano/smscoreapi.h | 1 - drivers/media/usb/siano/smsusb.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h index b5d85fd0bee8..13bd7ef7a588 100644 --- a/drivers/media/common/siano/smscoreapi.h +++ b/drivers/media/common/siano/smscoreapi.h @@ -1181,7 +1181,6 @@ int smscore_led_state(struct smscore_device_t *core, int led); #define sms_log(fmt, arg...) pr_info(fmt "\n", ##arg) #define sms_err(fmt, arg...) pr_err(fmt " on line: %d\n", ##arg, __LINE__) -#define sms_warn(fmt, arg...) pr_warn(fmt "\n", ##arg) #define sms_info(fmt, arg...) do {\ if (sms_dbg & DBG_INFO) \ pr_info(fmt "\n", ##arg); \ diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c index 426455118d02..244674599878 100644 --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c @@ -258,13 +258,13 @@ static int smsusb1_load_firmware(struct usb_device *udev, int id, int board_id) rc = request_firmware(&fw, fw_filename, &udev->dev); if (rc < 0) { - sms_warn("failed to open \"%s\" mode %d, " - "trying again with default firmware", fw_filename, id); + pr_warn("failed to open '%s' mode %d, trying again with default firmware\n", + fw_filename, id); fw_filename = smsusb1_fw_lkup[id]; rc = request_firmware(&fw, fw_filename, &udev->dev); if (rc < 0) { - sms_warn("failed to open \"%s\" mode %d", + pr_warn("failed to open '%s' mode %d\n", fw_filename, id); return rc;