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>
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index 9660599..336d97d 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -301,7 +301,6 @@
};
#define LOAD_PAGE3 255
-#define LOAD_PAGE4 254
#define END_OF_SEQUENCE 0
/* pac 7302 */
@@ -486,8 +485,7 @@
/* 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 @@
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 @@
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 704cf67..a9f195e 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -200,7 +200,6 @@
.priv = 0},
};
-#define LOAD_PAGE3 255
#define LOAD_PAGE4 254
#define END_OF_SEQUENCE 0
@@ -344,7 +343,6 @@
/* 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 @@
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 @@
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);