diff options
author | Mike Isely <isely@pobox.com> | 2008-09-03 20:51:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:58 -0400 |
commit | 2bb87c24d7d5639bff65b41b1306542d6d2bf7d0 (patch) | |
tree | cfec14ad4b7584ef80aa26000b942332da571394 /drivers/media/video/pvrusb2/pvrusb2-hdw.c | |
parent | 0cc118671282044b2a87621e16d7722d5e60cd08 (diff) |
V4L/DVB (8902): pvrusb2: Remove comment lines which refer to checkpatch's behavior
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 9bb59b2de917..94265bd3d926 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -408,7 +408,6 @@ static int ctrl_cropl_min_get(struct pvr2_ctrl *cptr, int *left) | |||
408 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 408 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
409 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 409 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
410 | if (stat != 0) { | 410 | if (stat != 0) { |
411 | /* Keep checkpatch.pl quiet */ | ||
412 | return stat; | 411 | return stat; |
413 | } | 412 | } |
414 | *left = cap->bounds.left; | 413 | *left = cap->bounds.left; |
@@ -420,13 +419,10 @@ static int ctrl_cropl_max_get(struct pvr2_ctrl *cptr, int *left) | |||
420 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 419 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
421 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 420 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
422 | if (stat != 0) { | 421 | if (stat != 0) { |
423 | /* Keep checkpatch.pl quiet */ | ||
424 | return stat; | 422 | return stat; |
425 | } | 423 | } |
426 | *left = cap->bounds.left; | 424 | *left = cap->bounds.left; |
427 | if (cap->bounds.width > cptr->hdw->cropw_val) { | 425 | if (cap->bounds.width > cptr->hdw->cropw_val) { |
428 | /* This statement is present purely to shut up | ||
429 | checkpatch.pl */ | ||
430 | *left += cap->bounds.width - cptr->hdw->cropw_val; | 426 | *left += cap->bounds.width - cptr->hdw->cropw_val; |
431 | } | 427 | } |
432 | return 0; | 428 | return 0; |
@@ -437,7 +433,6 @@ static int ctrl_cropt_min_get(struct pvr2_ctrl *cptr, int *top) | |||
437 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 433 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
438 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 434 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
439 | if (stat != 0) { | 435 | if (stat != 0) { |
440 | /* Keep checkpatch.pl quiet */ | ||
441 | return stat; | 436 | return stat; |
442 | } | 437 | } |
443 | *top = cap->bounds.top; | 438 | *top = cap->bounds.top; |
@@ -449,12 +444,10 @@ static int ctrl_cropt_max_get(struct pvr2_ctrl *cptr, int *top) | |||
449 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 444 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
450 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 445 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
451 | if (stat != 0) { | 446 | if (stat != 0) { |
452 | /* Keep checkpatch.pl quiet */ | ||
453 | return stat; | 447 | return stat; |
454 | } | 448 | } |
455 | *top = cap->bounds.top; | 449 | *top = cap->bounds.top; |
456 | if (cap->bounds.height > cptr->hdw->croph_val) { | 450 | if (cap->bounds.height > cptr->hdw->croph_val) { |
457 | /* Keep checkpatch.pl quiet */ | ||
458 | *top += cap->bounds.height - cptr->hdw->croph_val; | 451 | *top += cap->bounds.height - cptr->hdw->croph_val; |
459 | } | 452 | } |
460 | return 0; | 453 | return 0; |
@@ -465,12 +458,10 @@ static int ctrl_cropw_max_get(struct pvr2_ctrl *cptr, int *val) | |||
465 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 458 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
466 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 459 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
467 | if (stat != 0) { | 460 | if (stat != 0) { |
468 | /* Keep checkpatch.pl quiet */ | ||
469 | return stat; | 461 | return stat; |
470 | } | 462 | } |
471 | *val = 0; | 463 | *val = 0; |
472 | if (cap->bounds.width > cptr->hdw->cropl_val) { | 464 | if (cap->bounds.width > cptr->hdw->cropl_val) { |
473 | /* Keep checkpatch.pl quiet */ | ||
474 | *val = cap->bounds.width - cptr->hdw->cropl_val; | 465 | *val = cap->bounds.width - cptr->hdw->cropl_val; |
475 | } | 466 | } |
476 | return 0; | 467 | return 0; |
@@ -481,12 +472,10 @@ static int ctrl_croph_max_get(struct pvr2_ctrl *cptr, int *val) | |||
481 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 472 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
482 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 473 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
483 | if (stat != 0) { | 474 | if (stat != 0) { |
484 | /* Keep checkpatch.pl quiet */ | ||
485 | return stat; | 475 | return stat; |
486 | } | 476 | } |
487 | *val = 0; | 477 | *val = 0; |
488 | if (cap->bounds.height > cptr->hdw->cropt_val) { | 478 | if (cap->bounds.height > cptr->hdw->cropt_val) { |
489 | /* Keep checkpatch.pl quiet */ | ||
490 | *val = cap->bounds.height - cptr->hdw->cropt_val; | 479 | *val = cap->bounds.height - cptr->hdw->cropt_val; |
491 | } | 480 | } |
492 | return 0; | 481 | return 0; |
@@ -497,7 +486,6 @@ static int ctrl_get_cropcapbl(struct pvr2_ctrl *cptr, int *val) | |||
497 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 486 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
498 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 487 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
499 | if (stat != 0) { | 488 | if (stat != 0) { |
500 | /* Keep checkpatch.pl quiet */ | ||
501 | return stat; | 489 | return stat; |
502 | } | 490 | } |
503 | *val = cap->bounds.left; | 491 | *val = cap->bounds.left; |
@@ -509,7 +497,6 @@ static int ctrl_get_cropcapbt(struct pvr2_ctrl *cptr, int *val) | |||
509 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 497 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
510 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 498 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
511 | if (stat != 0) { | 499 | if (stat != 0) { |
512 | /* Keep checkpatch.pl quiet */ | ||
513 | return stat; | 500 | return stat; |
514 | } | 501 | } |
515 | *val = cap->bounds.top; | 502 | *val = cap->bounds.top; |
@@ -521,7 +508,6 @@ static int ctrl_get_cropcapbw(struct pvr2_ctrl *cptr, int *val) | |||
521 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 508 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
522 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 509 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
523 | if (stat != 0) { | 510 | if (stat != 0) { |
524 | /* Keep checkpatch.pl quiet */ | ||
525 | return stat; | 511 | return stat; |
526 | } | 512 | } |
527 | *val = cap->bounds.width; | 513 | *val = cap->bounds.width; |
@@ -533,7 +519,6 @@ static int ctrl_get_cropcapbh(struct pvr2_ctrl *cptr, int *val) | |||
533 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 519 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
534 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 520 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
535 | if (stat != 0) { | 521 | if (stat != 0) { |
536 | /* Keep checkpatch.pl quiet */ | ||
537 | return stat; | 522 | return stat; |
538 | } | 523 | } |
539 | *val = cap->bounds.height; | 524 | *val = cap->bounds.height; |
@@ -545,7 +530,6 @@ static int ctrl_get_cropcapdl(struct pvr2_ctrl *cptr, int *val) | |||
545 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 530 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
546 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 531 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
547 | if (stat != 0) { | 532 | if (stat != 0) { |
548 | /* Keep checkpatch.pl quiet */ | ||
549 | return stat; | 533 | return stat; |
550 | } | 534 | } |
551 | *val = cap->defrect.left; | 535 | *val = cap->defrect.left; |
@@ -557,7 +541,6 @@ static int ctrl_get_cropcapdt(struct pvr2_ctrl *cptr, int *val) | |||
557 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 541 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
558 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 542 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
559 | if (stat != 0) { | 543 | if (stat != 0) { |
560 | /* Keep checkpatch.pl quiet */ | ||
561 | return stat; | 544 | return stat; |
562 | } | 545 | } |
563 | *val = cap->defrect.top; | 546 | *val = cap->defrect.top; |
@@ -569,7 +552,6 @@ static int ctrl_get_cropcapdw(struct pvr2_ctrl *cptr, int *val) | |||
569 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 552 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
570 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 553 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
571 | if (stat != 0) { | 554 | if (stat != 0) { |
572 | /* Keep checkpatch.pl quiet */ | ||
573 | return stat; | 555 | return stat; |
574 | } | 556 | } |
575 | *val = cap->defrect.width; | 557 | *val = cap->defrect.width; |
@@ -581,7 +563,6 @@ static int ctrl_get_cropcapdh(struct pvr2_ctrl *cptr, int *val) | |||
581 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 563 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
582 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 564 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
583 | if (stat != 0) { | 565 | if (stat != 0) { |
584 | /* Keep checkpatch.pl quiet */ | ||
585 | return stat; | 566 | return stat; |
586 | } | 567 | } |
587 | *val = cap->defrect.height; | 568 | *val = cap->defrect.height; |
@@ -593,7 +574,6 @@ static int ctrl_get_cropcappan(struct pvr2_ctrl *cptr, int *val) | |||
593 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 574 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
594 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 575 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
595 | if (stat != 0) { | 576 | if (stat != 0) { |
596 | /* Keep checkpatch.pl quiet */ | ||
597 | return stat; | 577 | return stat; |
598 | } | 578 | } |
599 | *val = cap->pixelaspect.numerator; | 579 | *val = cap->pixelaspect.numerator; |
@@ -605,7 +585,6 @@ static int ctrl_get_cropcappad(struct pvr2_ctrl *cptr, int *val) | |||
605 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; | 585 | struct v4l2_cropcap *cap = &cptr->hdw->cropcap_info; |
606 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); | 586 | int stat = pvr2_hdw_check_cropcap(cptr->hdw); |
607 | if (stat != 0) { | 587 | if (stat != 0) { |
608 | /* Keep checkpatch.pl quiet */ | ||
609 | return stat; | 588 | return stat; |
610 | } | 589 | } |
611 | *val = cap->pixelaspect.denominator; | 590 | *val = cap->pixelaspect.denominator; |
@@ -3008,12 +2987,10 @@ void pvr2_hdw_execute_tuner_poll(struct pvr2_hdw *hdw) | |||
3008 | static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw) | 2987 | static int pvr2_hdw_check_cropcap(struct pvr2_hdw *hdw) |
3009 | { | 2988 | { |
3010 | if (!hdw->cropcap_stale) { | 2989 | if (!hdw->cropcap_stale) { |
3011 | /* Keep checkpatch.pl quiet */ | ||
3012 | return 0; | 2990 | return 0; |
3013 | } | 2991 | } |
3014 | pvr2_i2c_core_status_poll(hdw); | 2992 | pvr2_i2c_core_status_poll(hdw); |
3015 | if (hdw->cropcap_stale) { | 2993 | if (hdw->cropcap_stale) { |
3016 | /* Keep checkpatch.pl quiet */ | ||
3017 | return -EIO; | 2994 | return -EIO; |
3018 | } | 2995 | } |
3019 | return 0; | 2996 | return 0; |
@@ -3027,7 +3004,6 @@ int pvr2_hdw_get_cropcap(struct pvr2_hdw *hdw, struct v4l2_cropcap *pp) | |||
3027 | LOCK_TAKE(hdw->big_lock); | 3004 | LOCK_TAKE(hdw->big_lock); |
3028 | stat = pvr2_hdw_check_cropcap(hdw); | 3005 | stat = pvr2_hdw_check_cropcap(hdw); |
3029 | if (!stat) { | 3006 | if (!stat) { |
3030 | /* Keep checkpatch.pl quiet */ | ||
3031 | memcpy(pp, &hdw->cropcap_info, sizeof(hdw->cropcap_info)); | 3007 | memcpy(pp, &hdw->cropcap_info, sizeof(hdw->cropcap_info)); |
3032 | } | 3008 | } |
3033 | LOCK_GIVE(hdw->big_lock); | 3009 | LOCK_GIVE(hdw->big_lock); |