# HG changeset patch # User Jiri Slaby jirislaby@gmail.com # Date 1191758673 -7200 # Node ID 14896a4d8f5d21d20b84dfd0a147c5a326f34599 # Parent 86d96d9bea4a26de43c0b7997cd751b49fe5ba0b v4l2_extension: checkpatch fixups

yet another cleanups how checkpatch offers them

Signed-off-by: Jiri Slaby jirislaby@gmail.com

diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c @@ -78,7 +78,7 @@ static int v4l2ext_hlp_open(struct inode /* allocate and initialize device private data structure */ dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (dev == NULL) { - printk("cannot allocate device.\n"); + printk(KERN_ERR "cannot allocate device.\n"); return -ENOMEM; }

@@ -88,7 +88,8 @@ static int v4l2ext_hlp_open(struct inode return 0; }

-static int v4l2ext_hlp_release(struct inode *inode, struct file *file) { +static int v4l2ext_hlp_release(struct inode *inode, struct file *file) +{

mutex_lock(&helper_daemon_lock); /* Helper daemon has gone */ @@ -100,8 +101,7 @@ static int v4l2ext_hlp_release(struct in return 0; }

-static const struct file_operations v4l2ext_hlp_fops= -{ +static const struct file_operations v4l2ext_hlp_fops = { .owner = THIS_MODULE, .open = v4l2ext_hlp_open, .poll = v4l2ext_hlp_poll, @@ -142,7 +142,8 @@ err: return ret; }

-void v4l2ext_hlp_fini(void) { +void v4l2ext_hlp_fini(void) +{ class_device_destroy(helper_class, MKDEV(helper_major, 0)); unregister_chrdev(helper_major, HELPER_IF_NAME); class_destroy(helper_class); diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c @@ -37,9 +37,9 @@ MODULE_LICENSE("GPL");

static unsigned int video_debug; module_param(video_debug, int, 0644); -MODULE_PARM_DESC(video_debug,"enable debug messages [video]"); - -#define dprintk(level,fmt, arg...) do { \ +MODULE_PARM_DESC(video_debug, "enable debug messages [video]"); + +#define dprintk(level, fmt, arg...) do { \ if (video_debug >= level) \ printk(KERN_DEBUG "v4l2_extension: " fmt, ## arg); \ } while (0) @@ -107,7 +107,7 @@ video_poll(struct file *file, struct pol struct video_device *base_dev = dev->base_vdev;

if (base_dev->fops->poll) - return base_dev->fops->poll(&dev->fake_file,wait); + return base_dev->fops->poll(&dev->fake_file, wait); else return -EINVAL; } diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension.h b/linux/drivers/media/video/v4l2_extension/v4l2_extension.h --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension.h +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension.h @@ -30,7 +30,7 @@ #include <linux/version.h> #include <linux/mutex.h>

-#define V4L2EXT_VERSION_CODE KERNEL_VERSION(0,0,1) +#define V4L2EXT_VERSION_CODE KERNEL_VERSION(0, 0, 1)

/***************************************************************************/ /* v4l2 extension driver public interface */