diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2010-01-13 08:30:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:10:47 -0300 |
| commit | 23a5de202bc385b69eb91a5db36699e9579ec03e (patch) | |
| tree | 450d07dca6b63992c3d8dc293704a0dd7ede22cb | |
| parent | 9919fe891da1bd61fad78a0e1e3c0f21cd127eca (diff) | |
| download | linux-23a5de202bc385b69eb91a5db36699e9579ec03e.tar.bz2 | |
V4L/DVB: gspca - pac7302/pac7311: Remove the unused page loading
There is only one page to load (page 3 for pac7302 and page 4 for pac7311).
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/gspca/pac7302.c | 10 | ||||
| -rw-r--r-- | drivers/media/video/gspca/pac7311.c | 6 |
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c index 9660599f783e..336d97ddf54e 100644 --- a/drivers/media/video/gspca/pac7302.c +++ b/drivers/media/video/gspca/pac7302.c @@ -301,7 +301,6 @@ static const struct v4l2_pix_format vga_mode[] = { }; #define LOAD_PAGE3 255 -#define LOAD_PAGE4 254 #define END_OF_SEQUENCE 0 /* pac 7302 */ @@ -486,8 +485,7 @@ static int reg_w_page(struct gspca_dev *gspca_dev, /* output a variable sequence */ static int reg_w_var(struct gspca_dev *gspca_dev, const __u8 *seq, - const __u8 *page3, unsigned int page3_len, - const __u8 *page4, unsigned int page4_len) + const __u8 *page3, unsigned int page3_len) { int index, len; int ret = 0; @@ -498,9 +496,6 @@ static int reg_w_var(struct gspca_dev *gspca_dev, switch (len) { case END_OF_SEQUENCE: return ret; - case LOAD_PAGE4: - ret = reg_w_page(gspca_dev, page4, page4_len); - break; case LOAD_PAGE3: ret = reg_w_page(gspca_dev, page3, page3_len); break; @@ -745,8 +740,7 @@ static int sd_start(struct gspca_dev *gspca_dev) sd->sof_read = 0; ret = reg_w_var(gspca_dev, start_7302, - page3_7302, sizeof(page3_7302), - NULL, 0); + page3_7302, sizeof(page3_7302)); if (0 <= ret) ret = setbrightcont(gspca_dev); if (0 <= ret) diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c index 704cf67e1788..a9f195e6677c 100644 --- a/drivers/media/video/gspca/pac7311.c +++ b/drivers/media/video/gspca/pac7311.c @@ -200,7 +200,6 @@ static const struct v4l2_pix_format vga_mode[] = { .priv = 0}, }; -#define LOAD_PAGE3 255 #define LOAD_PAGE4 254 #define END_OF_SEQUENCE 0 @@ -344,7 +343,6 @@ static int reg_w_page(struct gspca_dev *gspca_dev, /* output a variable sequence */ static int reg_w_var(struct gspca_dev *gspca_dev, const __u8 *seq, - const __u8 *page3, unsigned int page3_len, const __u8 *page4, unsigned int page4_len) { int index, len; @@ -359,9 +357,6 @@ static int reg_w_var(struct gspca_dev *gspca_dev, case LOAD_PAGE4: ret = reg_w_page(gspca_dev, page4, page4_len); break; - case LOAD_PAGE3: - ret = reg_w_page(gspca_dev, page3, page3_len); - break; default: if (len > USB_BUF_SZ) { PDEBUG(D_ERR|D_STREAM, @@ -515,7 +510,6 @@ static int sd_start(struct gspca_dev *gspca_dev) sd->sof_read = 0; ret = reg_w_var(gspca_dev, start_7311, - NULL, 0, page4_7311, sizeof(page4_7311)); if (0 <= ret) ret = setcontrast(gspca_dev); |