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/spca500.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/spca500.c')
-rw-r--r-- | drivers/media/video/gspca/spca500.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c index e00f3b53bdff..62c12fa10570 100644 --- a/drivers/media/video/gspca/spca500.c +++ b/drivers/media/video/gspca/spca500.c | |||
@@ -935,16 +935,6 @@ static void setbrightness(struct gspca_dev *gspca_dev) | |||
935 | (__u8) (sd->brightness - 128)); | 935 | (__u8) (sd->brightness - 128)); |
936 | } | 936 | } |
937 | 937 | ||
938 | static void getbrightness(struct gspca_dev *gspca_dev) | ||
939 | { | ||
940 | struct sd *sd = (struct sd *) gspca_dev; | ||
941 | int ret; | ||
942 | |||
943 | ret = reg_r_12(gspca_dev, 0x00, 0x8167, 1); | ||
944 | if (ret >= 0) | ||
945 | sd->brightness = ret + 128; | ||
946 | } | ||
947 | |||
948 | static void setcontrast(struct gspca_dev *gspca_dev) | 938 | static void setcontrast(struct gspca_dev *gspca_dev) |
949 | { | 939 | { |
950 | struct sd *sd = (struct sd *) gspca_dev; | 940 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -952,16 +942,6 @@ static void setcontrast(struct gspca_dev *gspca_dev) | |||
952 | reg_w(gspca_dev, 0x00, 0x8168, sd->contrast); | 942 | reg_w(gspca_dev, 0x00, 0x8168, sd->contrast); |
953 | } | 943 | } |
954 | 944 | ||
955 | static void getcontrast(struct gspca_dev *gspca_dev) | ||
956 | { | ||
957 | struct sd *sd = (struct sd *) gspca_dev; | ||
958 | int ret; | ||
959 | |||
960 | ret = reg_r_12(gspca_dev, 0x0, 0x8168, 1); | ||
961 | if (ret >= 0) | ||
962 | sd->contrast = ret; | ||
963 | } | ||
964 | |||
965 | static void setcolors(struct gspca_dev *gspca_dev) | 945 | static void setcolors(struct gspca_dev *gspca_dev) |
966 | { | 946 | { |
967 | struct sd *sd = (struct sd *) gspca_dev; | 947 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -969,16 +949,6 @@ static void setcolors(struct gspca_dev *gspca_dev) | |||
969 | reg_w(gspca_dev, 0x00, 0x8169, sd->colors); | 949 | reg_w(gspca_dev, 0x00, 0x8169, sd->colors); |
970 | } | 950 | } |
971 | 951 | ||
972 | static void getcolors(struct gspca_dev *gspca_dev) | ||
973 | { | ||
974 | struct sd *sd = (struct sd *) gspca_dev; | ||
975 | int ret; | ||
976 | |||
977 | ret = reg_r_12(gspca_dev, 0x0, 0x8169, 1); | ||
978 | if (ret >= 0) | ||
979 | sd->colors = ret; | ||
980 | } | ||
981 | |||
982 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) | 952 | static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) |
983 | { | 953 | { |
984 | struct sd *sd = (struct sd *) gspca_dev; | 954 | struct sd *sd = (struct sd *) gspca_dev; |
@@ -993,7 +963,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val) | |||
993 | { | 963 | { |
994 | struct sd *sd = (struct sd *) gspca_dev; | 964 | struct sd *sd = (struct sd *) gspca_dev; |
995 | 965 | ||
996 | getbrightness(gspca_dev); | ||
997 | *val = sd->brightness; | 966 | *val = sd->brightness; |
998 | return 0; | 967 | return 0; |
999 | } | 968 | } |
@@ -1012,7 +981,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val) | |||
1012 | { | 981 | { |
1013 | struct sd *sd = (struct sd *) gspca_dev; | 982 | struct sd *sd = (struct sd *) gspca_dev; |
1014 | 983 | ||
1015 | getcontrast(gspca_dev); | ||
1016 | *val = sd->contrast; | 984 | *val = sd->contrast; |
1017 | return 0; | 985 | return 0; |
1018 | } | 986 | } |
@@ -1031,7 +999,6 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val) | |||
1031 | { | 999 | { |
1032 | struct sd *sd = (struct sd *) gspca_dev; | 1000 | struct sd *sd = (struct sd *) gspca_dev; |
1033 | 1001 | ||
1034 | getcolors(gspca_dev); | ||
1035 | *val = sd->colors; | 1002 | *val = sd->colors; |
1036 | return 0; | 1003 | return 0; |
1037 | } | 1004 | } |