Commit 4dbf46a0485a5b0704e1c4b55a173128fbaedec9
Committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
1 parent
1159b7f19f
Exists in
master
and in
7 other branches
V4L/DVB (10931): 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. Cc: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Showing 2 changed files with 1 additions and 22 deletions Side-by-side Diff
Documentation/video4linux/Zoran
| ... | ... | @@ -401,8 +401,7 @@ |
| 401 | 401 | first set the correct norm. Well, it seems logically correct: TV |
| 402 | 402 | standard is "more constant" for current country than geometry |
| 403 | 403 | settings of a variety of TV capture cards which may work in ITU or |
| 404 | - square pixel format. Remember that users now can lock the norm to | |
| 405 | - avoid any ambiguity. | |
| 404 | + square pixel format. | |
| 406 | 405 | -- |
| 407 | 406 | Please note that lavplay/lavrec are also included in the MJPEG-tools |
| 408 | 407 | (http://mjpeg.sf.net/). |
drivers/media/video/zoran/zoran_driver.c
| ... | ... | @@ -162,10 +162,6 @@ |
| 162 | 162 | }; |
| 163 | 163 | #define NUM_FORMATS ARRAY_SIZE(zoran_formats) |
| 164 | 164 | |
| 165 | -static int lock_norm; /* 0 = default 1 = Don't change TV standard (norm) */ | |
| 166 | -module_param(lock_norm, int, 0644); | |
| 167 | -MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)"); | |
| 168 | - | |
| 169 | 165 | /* small helper function for calculating buffersizes for v4l2 |
| 170 | 166 | * we calculate the nearest higher power-of-two, which |
| 171 | 167 | * will be the recommended buffersize */ |
| ... | ... | @@ -1481,22 +1477,6 @@ |
| 1481 | 1477 | "%s: set_norm() called while in playback/capture mode\n", |
| 1482 | 1478 | ZR_DEVNAME(zr)); |
| 1483 | 1479 | return -EBUSY; |
| 1484 | - } | |
| 1485 | - | |
| 1486 | - if (lock_norm && norm != zr->norm) { | |
| 1487 | - if (lock_norm > 1) { | |
| 1488 | - dprintk(1, | |
| 1489 | - KERN_WARNING | |
| 1490 | - "%s: set_norm() - TV standard is locked, can not switch norm\n", | |
| 1491 | - ZR_DEVNAME(zr)); | |
| 1492 | - return -EPERM; | |
| 1493 | - } else { | |
| 1494 | - dprintk(1, | |
| 1495 | - KERN_WARNING | |
| 1496 | - "%s: set_norm() - TV standard is locked, norm was not changed\n", | |
| 1497 | - ZR_DEVNAME(zr)); | |
| 1498 | - norm = zr->norm; | |
| 1499 | - } | |
| 1500 | 1480 | } |
| 1501 | 1481 | |
| 1502 | 1482 | if (!(norm & zr->card.norms)) { |