zoran: Drop the lock_norm module parameter
PATCH 1/1 zoran: Drop the lock_norm module parameter
The lock_norm module parameter doesn't look terribly useful. If you don't want to change the norm, just don't change it. As a matter of fact, no other v4l driver has such a parameter.
Signed-off-by Jean Delvare <[email protected]>
Cc Trent Piepho <[email protected]>
Cc Hans Verkuil <[email protected]>
--- linux/Documentation/video4linux/Zoran | 3 +-- linux/drivers/media/video/zoran/zoran_driver.c | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-)
linux/Documentation/video4linux/Zoran +1 -2
@@ -401,8 +401,7 @@ Additional notes for software developers first set the correct norm. Well, it seems logically correct: TV standard is "more constant" for current country than geometry settings of a variety of TV capture cards which may work in ITU or - square pixel format. Remember that users now can lock the norm to - avoid any ambiguity. + square pixel format. -- Please note that lavplay/lavrec are also included in the MJPEG-tools (http://mjpeg.sf.net/).
linux/drivers/media/video/zoran/zoran_driver.c +0 -20
@@ -163,10 +163,6 @@ const struct zoran_format zoran_formats[ };#define NUM_FORMATS ARRAY_SIZE(zoran_formats) -static int lock_norm;/* 0 = default 1 = Don't change TV standard (norm) */ -module_param (lock_norm, int,0644 ); -MODULE_PARM_DESC (lock_norm,"Prevent norm changes (1 = ignore, >1 = fail)" ); -/* small helper function for calculating buffersizes for v4l2 * we calculate the nearest higher power-of-two, which * will be the recommended buffersize */
@@ -1497,22 +1493,6 @@ zoran_set_norm (struct zoran *zr,return -EBUSY ; } -if (lock_norm && norm != zr->norm) { -if (lock_norm >1 ) { -dprintk (1 , -KERN_WARNING -"%s: set_norm() - TV standard is locked, can not switch norm\n" , -ZR_DEVNAME (zr)); -return -EPERM ; - }else { -dprintk (1 , -KERN_WARNING -"%s: set_norm() - TV standard is locked, norm was not changed\n" , -ZR_DEVNAME (zr)); - norm = zr->norm; - } - } -if (!(norm & zr->card.norms)) { dprintk(1, KERN_ERR "%s: set_norm() - unsupported norm %llx\n",
Signature · 1 line
Jean Delvare
Quoted 11 lines · Jean Delvare
The
lock_normmodule parameter doesn't look terribly useful. If you don't want to change the norm, just don't change it. As a matter of fact, no other v4l driver has such a parameter.Signed-off-by Jean Delvare <[email protected]>Cc Trent Piepho <[email protected]>Cc Hans Verkuil <[email protected]>--- linux/Documentation/video4linux/Zoran | 3 +-- linux/drivers/media/video/zoran/zoran_driver.c | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-)
I have a tree with some more zoran changes, so I'll take this patch and the other one and work them in.
Quoted 54 lines
linux/Documentation/video4linux/Zoran +1
-2@@ -401,8 +401,7 @@ Additional notes for software developers first set the correct norm. Well, it seems logically correct: TV standard is "more constant" for current country than geometry settings of a variety of TV capture cards which may work in ITU or - square pixel format. Remember that users now can lock the norm to - avoid any ambiguity. + square pixel format. -- Please note that lavplay/lavrec are also included in the MJPEG-tools (http://mjpeg.sf.net/).linux/drivers/media/video/zoran/zoran_driver.c +0
-21@@ -163,10 +163,6 @@ const struct zoran_format zoran_formats[ };#define NUM_FORMATS ARRAY_SIZE(zoran_formats) -static int lock_norm;/* 0 = default 1 = Don't change TV standard (norm) */ -module_param (lock_norm, int,0644 ); -MODULE_PARM_DESC (lock_norm,"Prevent norm changes (1 = ignore, >1 = fail)" ); -/* small helper function for calculating buffersizes for v4l2 * we calculate the nearest higher power-of-two, which * will be the recommended buffersize */ @@ -1497,22 +1493,6 @@ zoran_set_norm (struct zoran *zr,return -EBUSY ; } -if (lock_norm && norm != zr->norm) { -if (lock_norm >1 ) { -dprintk (1 , -KERN_WARNING -"%s: set_norm() - TV standard is locked, can not switch norm\n" , -ZR_DEVNAME (zr)); -return -EPERM ; - }else { -dprintk (1 , -KERN_WARNING -"%s: set_norm() - TV standard is locked, norm was not changed\n" , -ZR_DEVNAME (zr)); - norm = zr->norm; - } - } -if (!(norm & zr->card.norms)) { dprintk(1, KERN_ERR "%s: set_norm() - unsupported norm %llx\n", --Jean Delvare