Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 857011e4 authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab
Browse files

[media] et61x251: Use current logging styles 



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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8af443e5

drivers/media/video/et61x251/et61x251.h

+35 −31
Original line number Diff line number Diff line
@@ -165,26 +165,30 @@ et61x251_attach_sensor(struct et61x251_device* cam, 
#undef DBG

#undef KDBG

#ifdef ET61X251_DEBUG

#	define DBG(level, fmt, args...)                                       \

#define DBG(level, fmt, ...)						\

do {									\

	if (debug >= (level)) {						\

		if ((level) == 1)					\

			dev_err(&cam->usbdev->dev, fmt "\n", ## args);        \

			dev_err(&cam->usbdev->dev, fmt "\n",		\

				##__VA_ARGS__);				\

		else if ((level) == 2)					\

			dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \

			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__ , ## args); \

				 __FILE__, __func__, __LINE__,		\

				 ##__VA_ARGS__);			\

	}								\

} while (0)

#	define KDBG(level, fmt, args...)                                      \

#define KDBG(level, fmt, ...)						\

do {									\

	if (debug >= (level)) {						\

		if ((level) == 1 || (level) == 2)			\

			pr_info("et61x251: " fmt "\n", ## args);              \

			pr_info(fmt "\n", ##__VA_ARGS__);		\

		else if ((level) == 3)					\

			pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__,   \

				 __func__, __LINE__ , ## args);           \

			pr_debug("[%s:%s:%d] " fmt "\n",		\

				 __FILE__,  __func__, __LINE__,		\

				 ##__VA_ARGS__);			\

	}								\

} while (0)

#define V4LDBG(level, name, cmd)					\
@@ -193,15 +197,15 @@ do { \ 
		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 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 */

drivers/media/video/et61x251/et61x251_core.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

drivers/media/video/et61x251/et61x251_tas5130d1b.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *

 ***************************************************************************/



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include "et61x251_sensor.h"