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

Commit 2864462e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (8434): Fix x86_64 compilation and move some macros to v4l2-ioctl.h 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 35ea11ff

drivers/media/video/compat_ioctl32.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/videodev2.h>

#include <linux/module.h>

#include <linux/smp_lock.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>



#ifdef CONFIG_COMPAT

drivers/media/video/stradis.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/vmalloc.h>

#include <linux/videodev.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>



#include "saa7146.h"

#include "saa7146reg.h"

drivers/media/video/w9968cf.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <asm/page.h>

#include <asm/uaccess.h>

#include <linux/page-flags.h>

#include <media/v4l2-ioctl.h>



#include "w9968cf.h"

#include "w9968cf_decoder.h"

include/media/v4l2-common.h

+0 −22
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ 


#include <media/v4l2-dev.h>



/* v4l debugging and diagnostics */



/* Debug bitmask flags to be used on V4L2 */

#define V4L2_DEBUG_IOCTL     0x01

#define V4L2_DEBUG_IOCTL_ARG 0x02



/* Common printk constucts for v4l-i2c drivers. These macros create a unique

   prefix consisting of the driver name, the adapter number and the i2c

   address. */
@@ -61,22 +55,6 @@ 
			v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \

	} while (0)





/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */

#define v4l_print_ioctl(name, cmd)  		 \

	do {  					 \

		printk(KERN_DEBUG "%s: ", name); \

		v4l_printk_ioctl(cmd);		 \

	} while (0)



/* Use this macro in I2C drivers where 'client' is the struct i2c_client

   pointer */

#define v4l_i2c_print_ioctl(client, cmd) 		   \

	do {      					   \

		v4l_client_printk(KERN_DEBUG, client, ""); \

		v4l_printk_ioctl(cmd);			   \

	} while (0)



/* ------------------------------------------------------------------------- */



/* Priority helper functions */

include/media/v4l2-ioctl.h

+21 −0
Original line number Diff line number Diff line
@@ -20,6 +20,27 @@ 
#include <linux/videodev2.h>

#endif



/* v4l debugging and diagnostics */



/* Debug bitmask flags to be used on V4L2 */

#define V4L2_DEBUG_IOCTL     0x01

#define V4L2_DEBUG_IOCTL_ARG 0x02



/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */

#define v4l_print_ioctl(name, cmd)  		 \

	do {  					 \

		printk(KERN_DEBUG "%s: ", name); \

		v4l_printk_ioctl(cmd);		 \

	} while (0)



/* Use this macro in I2C drivers where 'client' is the struct i2c_client

   pointer */

#define v4l_i2c_print_ioctl(client, cmd) 		   \

	do {      					   \

		v4l_client_printk(KERN_DEBUG, client, ""); \

		v4l_printk_ioctl(cmd);			   \

	} while (0)



/*  Video standard functions  */

extern const char *v4l2_norm_to_name(v4l2_std_id id);

extern int v4l2_video_std_construct(struct v4l2_standard *vs,