From: Joe Perches <joe@perches.com>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
Luca Risolia <luca.risolia@studio.unibo.it>
Cc: linux-usb@vger.kernel.org, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 07/14] [media] et61x251: Use current logging styles
Date: Sun, 21 Aug 2011 15:56:50 -0700 [thread overview]
Message-ID: <41e34fe23bba1bd41c5c246edf0065ce150faada.1313966090.git.joe@perches.com> (raw)
In-Reply-To: <cover.1313966088.git.joe@perches.com>
Add pr_fmt and convert printks to pr_<level>
Remove explicit prefixes from logging messages.
One of the prefixes was defective, a copy/paste error.
Use ##__VA_ARGS__ for variadic macros.
Whitespace neatening.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/media/video/et61x251/et61x251.h | 66 ++++++++++---------
drivers/media/video/et61x251/et61x251_core.c | 2 +
drivers/media/video/et61x251/et61x251_tas5130d1b.c | 2 +
3 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index 14bb907..337ded4 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -165,45 +165,49 @@ et61x251_attach_sensor(struct et61x251_device* cam,
#undef DBG
#undef KDBG
#ifdef ET61X251_DEBUG
-# define DBG(level, fmt, args...) \
-do { \
- if (debug >= (level)) { \
- if ((level) == 1) \
- dev_err(&cam->usbdev->dev, fmt "\n", ## args); \
- else if ((level) == 2) \
- dev_info(&cam->usbdev->dev, fmt "\n", ## args); \
- else if ((level) >= 3) \
- dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \
- __FILE__, __func__, __LINE__ , ## args); \
- } \
+#define DBG(level, fmt, ...) \
+do { \
+ if (debug >= (level)) { \
+ if ((level) == 1) \
+ dev_err(&cam->usbdev->dev, fmt "\n", \
+ ##__VA_ARGS__); \
+ else if ((level) == 2) \
+ dev_info(&cam->usbdev->dev, fmt "\n", \
+ ##__VA_ARGS__); \
+ else if ((level) >= 3) \
+ dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \
+ __FILE__, __func__, __LINE__, \
+ ##__VA_ARGS__); \
+ } \
} while (0)
-# define KDBG(level, fmt, args...) \
-do { \
- if (debug >= (level)) { \
- if ((level) == 1 || (level) == 2) \
- pr_info("et61x251: " fmt "\n", ## args); \
- else if ((level) == 3) \
- pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__, \
- __func__, __LINE__ , ## args); \
- } \
+#define KDBG(level, fmt, ...) \
+do { \
+ if (debug >= (level)) { \
+ if ((level) == 1 || (level) == 2) \
+ pr_info(fmt "\n", ##__VA_ARGS__); \
+ else if ((level) == 3) \
+ pr_debug("[%s:%s:%d] " fmt "\n", \
+ __FILE__, __func__, __LINE__, \
+ ##__VA_ARGS__); \
+ } \
} while (0)
-# define V4LDBG(level, name, cmd) \
-do { \
- if (debug >= (level)) \
- v4l_print_ioctl(name, cmd); \
+#define V4LDBG(level, name, cmd) \
+do { \
+ if (debug >= (level)) \
+ v4l_print_ioctl(name, cmd); \
} while (0)
#else
-# define DBG(level, fmt, args...) do {;} while(0)
-# define KDBG(level, fmt, args...) do {;} while(0)
-# define V4LDBG(level, name, cmd) do {;} while(0)
+#define DBG(level, fmt, ...) do {;} while(0)
+#define KDBG(level, fmt, ...) do {;} while(0)
+#define V4LDBG(level, name, cmd) do {;} while(0)
#endif
#undef PDBG
-#define PDBG(fmt, args...) \
-dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __func__, \
- __LINE__ , ## args)
+#define PDBG(fmt, ...) \
+ dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \
+ __FILE__, __func__, __LINE__, ##__VA_ARGS__)
#undef PDBGG
-#define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
+#define PDBGG(fmt, args...) do {;} while (0) /* placeholder */
#endif /* _ET61X251_H_ */
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 9a1e80a..d3777c8 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
***************************************************************************/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/drivers/media/video/et61x251/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
index 04b7fbb..ced2e16 100644
--- a/drivers/media/video/et61x251/et61x251_tas5130d1b.c
+++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
***************************************************************************/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "et61x251_sensor.h"
--
1.7.6.405.gc1be0
next prev parent reply other threads:[~2011-08-21 22:59 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-21 22:56 [PATCH 00/14] [media] Logging cleanups Joe Perches
2011-08-21 22:56 ` [PATCH 01/14] [media] saa7146: Use current logging styles Joe Perches
2011-08-22 6:18 ` Michael Hunold
2011-08-21 22:56 ` [PATCH 02/14] [media] rc-core.h: Surround macro with do {} while (0) Joe Perches
2011-08-21 22:56 ` [PATCH 03/14] [media] ene_ir: Use current logging styles Joe Perches
2011-08-21 22:56 ` [PATCH 04/14] [media] winbond-cir: " Joe Perches
2011-08-25 11:52 ` David Härdeman
2011-08-21 22:56 ` [PATCH 05/14] [media] bt8xx: " Joe Perches
2011-08-21 22:56 ` [PATCH 06/14] [media] cx18: " Joe Perches
2011-08-24 10:34 ` Andy Walls
2011-08-24 21:42 ` Joe Perches
2011-08-27 13:28 ` Andy Walls
2011-08-27 16:42 ` Joe Perches
2011-08-27 17:05 ` Jean-Francois Moine
2011-08-27 17:31 ` Joe Perches
2011-08-27 17:23 ` Andy Walls
2011-09-04 0:21 ` Mauro Carvalho Chehab
2011-09-04 0:52 ` Joe Perches
2011-08-21 22:56 ` Joe Perches [this message]
2011-08-21 22:56 ` [PATCH 08/14] [media] gl860: " Joe Perches
2011-08-21 22:56 ` [PATCH 09/14] [media] m5602: " Joe Perches
2011-08-22 6:28 ` Erik Andrén
2011-08-21 22:56 ` [PATCH 10/14] [media] finepix: " Joe Perches
2011-08-21 22:56 ` [PATCH 11/14] [media] pac207: " Joe Perches
2011-08-21 22:56 ` [PATCH 12/14] [media] sn9c20x: " Joe Perches
2011-08-21 22:56 ` [PATCH 13/14] [media] t613: " Joe Perches
2011-08-21 22:56 ` [PATCH 14/14] [media] gspca: " Joe Perches
2011-08-22 8:50 ` Jean-Francois Moine
2011-08-22 15:20 ` Joe Perches
2011-08-22 18:36 ` Jean-Francois Moine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41e34fe23bba1bd41c5c246edf0065ce150faada.1313966090.git.joe@perches.com \
--to=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=luca.risolia@studio.unibo.it \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®