diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-01-10 14:11:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:31 -0400 |
commit | 8789d810f104a3e9f4289382968cf5482934b9fd (patch) | |
tree | a2b47587a702681c6793b98d9736596879ce8692 /drivers/media/video/gspca/etoms.c | |
parent | b3f5dbd0e1d4a1f9ed17cb40b9f789c606c44206 (diff) |
V4L/DVB (10353): gspca - some subdrivers: Don't get the control values from the webcam.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/etoms.c')
-rw-r--r-- | drivers/media/video/gspca/etoms.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c index 49ab2659a3f..2c20d06a03e 100644 --- a/drivers/media/video/gspca/etoms.c +++ b/drivers/media/video/gspca/etoms.c | |||
@@ -472,19 +472,6 @@ static void setbrightness(struct gspca_dev *gspca_dev) | |||
472 | reg_w_val(gspca_dev, ET_O_RED + i, brightness); | 472 | reg_w_val(gspca_dev, ET_O_RED + i, brightness); |
473 | } | 473 | } |
474 | 474 | ||
475 | static void getbrightness(struct gspca_dev *gspca_dev) | ||
476 | { | ||
477 | struct sd *sd = (struct sd *) gspca_dev; | ||
478 | int i; | ||
479 | int brightness = 0; | ||
480 | |||
481 | for (i = 0; i < 4; i++) { | ||
482 | reg_r(gspca_dev, ET_O_RED + i, 1); | ||
483 | brightness += gspca_dev->usb_buf[0]; | ||
484 | } | ||
485 | sd->brightness = brightness >> 3; | ||
486 | } | ||
487 | |||
488 | static void setcontrast(struct gspca_dev *gspca_dev) | 475 | static void setcontrast(struct gspca_dev *gspca_dev) |
489 | { | 476 | { |
490 | struct sd *sd = (struct sd *) gspca_dev; | 477 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -495,19 +482,6 @@ static void setcontrast(struct gspca_dev *gspca_dev) | |||
495 | reg_w(gspca_dev, ET_G_RED, RGBG, 6); | 482 | reg_w(gspca_dev, ET_G_RED, RGBG, 6); |
496 | } | 483 | } |
497 | 484 | ||
498 | static void getcontrast(struct gspca_dev *gspca_dev) | ||
499 | { | ||
500 | struct sd *sd = (struct sd *) gspca_dev; | ||
501 | int i; | ||
502 | int contrast = 0; | ||
503 | |||
504 | for (i = 0; i < 4; i++) { | ||
505 | reg_r(gspca_dev, ET_G_RED + i, 1); | ||
506 | contrast += gspca_dev->usb_buf[0]; | ||
507 | } | ||
508 | sd->contrast = contrast >> 2; | ||
509 | } | ||
510 | |||
511 | static void setcolors(struct gspca_dev *gspca_dev) | 485 | static void setcolors(struct gspca_dev *gspca_dev) |
512 | { | 486 | { |
513 | struct sd *sd = (struct sd *) gspca_dev; | 487 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -820,7 +794,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val) | |||
820 | { | 794 | { |
821 | struct sd *sd = (struct sd *) gspca_dev; | 795 | struct sd *sd = (struct sd *) gspca_dev; |
822 | 796 | ||
823 | getbrightness(gspca_dev); | ||
824 | *val = sd->brightness; | 797 | *val = sd->brightness; |
825 | return 0; | 798 | return 0; |
826 | } | 799 | } |
@@ -839,7 +812,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val) | |||
839 | { | 812 | { |
840 | struct sd *sd = (struct sd *) gspca_dev; | 813 | struct sd *sd = (struct sd *) gspca_dev; |
841 | 814 | ||
842 | getcontrast(gspca_dev); | ||
843 | *val = sd->contrast; | 815 | *val = sd->contrast; |
844 | return 0; | 816 | return 0; |
845 | } | 817 | } |
@@ -858,7 +830,6 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val) | |||
858 | { | 830 | { |
859 | struct sd *sd = (struct sd *) gspca_dev; | 831 | struct sd *sd = (struct sd *) gspca_dev; |
860 | 832 | ||
861 | getcolors(gspca_dev); | ||
862 | *val = sd->colors; | 833 | *val = sd->colors; |
863 | return 0; | 834 | return 0; |
864 | } | 835 | } |