lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] et61x251: Use current logging styles

Browse Source 
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Joe Perches
2011-08-21 19:56:50 -03:00
committed by Mauro Carvalho Chehab
parent 8af443e581
commit 857011e4d9
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/media/video/et61x251/et61x251.h
View File

@@ -165,45 +165,49 @@ et61x251_attach_sensor(struct et61x251_device* cam,
#undef DBG #undef DBG
#undef KDBG #undef KDBG
#ifdef ET61X251_DEBUG #ifdef ET61X251_DEBUG
# define DBG(level, fmt, args...) \ #define DBG(level, fmt, ...) \
do { \ do { \
if (debug >= (level)) { \ if (debug >= (level)) { \
if ((level) == 1) \ if ((level) == 1) \
dev_err(&cam->usbdev->dev, fmt "\n", ## args); \ dev_err(&cam->usbdev->dev, fmt "\n", \
else if ((level) == 2) \ ##__VA_ARGS__); \
dev_info(&cam->usbdev->dev, fmt "\n", ## args); \ else if ((level) == 2) \
else if ((level) >= 3) \ dev_info(&cam->usbdev->dev, fmt "\n", \
dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \ ##__VA_ARGS__); \
__FILE__, __func__, __LINE__ , ## args); \ else if ((level) >= 3) \
} \ dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \
__FILE__, __func__, __LINE__, \
##__VA_ARGS__); \
} \
} while (0) } while (0)
# define KDBG(level, fmt, args...) \ #define KDBG(level, fmt, ...) \
do { \ do { \
if (debug >= (level)) { \ if (debug >= (level)) { \
if ((level) == 1 || (level) == 2) \ if ((level) == 1 || (level) == 2) \
pr_info("et61x251: " fmt "\n", ## args); \ pr_info(fmt "\n", ##__VA_ARGS__); \
else if ((level) == 3) \ else if ((level) == 3) \
pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__, \ pr_debug("[%s:%s:%d] " fmt "\n", \
__func__, __LINE__ , ## args); \ __FILE__, __func__, __LINE__, \
} \ ##__VA_ARGS__); \
} \
} while (0) } while (0)
# define V4LDBG(level, name, cmd) \ #define V4LDBG(level, name, cmd) \
do { \ do { \
if (debug >= (level)) \ if (debug >= (level)) \
v4l_print_ioctl(name, cmd); \ v4l_print_ioctl(name, cmd); \
} while (0) } while (0)
#else #else
# define DBG(level, fmt, args...) do {;} while(0) #define DBG(level, fmt, ...) do {;} while(0)
# define KDBG(level, fmt, args...) do {;} while(0) #define KDBG(level, fmt, ...) do {;} while(0)
# define V4LDBG(level, name, cmd) do {;} while(0) #define V4LDBG(level, name, cmd) do {;} while(0)
#endif #endif
#undef PDBG #undef PDBG
#define PDBG(fmt, args...) \ #define PDBG(fmt, ...) \
dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __func__, \ dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \
__LINE__ , ## args) __FILE__, __func__, __LINE__, ##__VA_ARGS__)
#undef PDBGG #undef PDBGG
#define PDBGG(fmt, args...) do {;} while(0) /* placeholder */ #define PDBGG(fmt, args...) do {;} while (0) /* placeholder */
#endif /* _ET61X251_H_ */ #endif /* _ET61X251_H_ */

2
drivers/media/video/et61x251/et61x251_core.c
View File

@@ -18,6 +18,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
***************************************************************************/ ***************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/version.h> #include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>

2
drivers/media/video/et61x251/et61x251_tas5130d1b.c
View File

@@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
***************************************************************************/ ***************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "et61x251_sensor.h" #include "et61x251_sensor.h"