aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-22 10:55:55 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-26 09:10:02 -0300
commit535bd1e96e6ea5eedd1171f0d4a7750597bb4cbf (patch)
treee54f757154c786cb15ff8b13d696df7ecde60f0d
parent[media] siano: use pr_* print functions (diff)
downloadlinux-dev-535bd1e96e6ea5eedd1171f0d4a7750597bb4cbf.tar.xz
linux-dev-535bd1e96e6ea5eedd1171f0d4a7750597bb4cbf.zip
[media] siano: replace sms_warn() by pr_warn()
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 <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/common/siano/smscoreapi.h1
-rw-r--r--drivers/media/usb/siano/smsusb.c6
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;