[media] gspca: Remove the useless variable 'nbalt'

As the alternate settings are now sorted in gspca main,
the variable 'nbalt' is no more useful.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/benq.c b/drivers/media/video/gspca/benq.c
index 1d1a412d6264812eed90bb55279ee20d98be171a..390291ceba26f6c85f7c1458795d55818c19b784 100644 (file)
--- a/drivers/media/video/gspca/benq.c
+++ b/drivers/media/video/gspca/benq.c
@@ -134,13 +134,17 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
+       struct usb_interface *intf;
+
        reg_w(gspca_dev, 0x003c, 0x0003);
        reg_w(gspca_dev, 0x003c, 0x0004);
        reg_w(gspca_dev, 0x003c, 0x0005);
        reg_w(gspca_dev, 0x003c, 0x0006);
        reg_w(gspca_dev, 0x003c, 0x0007);
+
+       intf = usb_ifnum_to_if(gspca_dev->dev, gspca_dev->iface);
        usb_set_interface(gspca_dev->dev, gspca_dev->iface,
-                                       gspca_dev->nbalt - 1);
+                                       intf->num_altsetting - 1);
 }
 
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,

diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index 2ced3b73994fed758bd126e9a55efc6d1ce2bdde..d74da8e0fef9b739eb074ec050ee2ac8d30a5859 100644 (file)
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -337,7 +337,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                return -1;
 
        cam = &gspca_dev->cam;
-       gspca_dev->nbalt = 4;
 
        switch (sd->sensor) {
        case ID_MI1320:

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 881e04c7ffe6dd91f5a96f12aaebe236a7bfba5c..271be9866893e678e4c35ae83fe305bb9a6d961c 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -880,7 +880,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
        for (;;) {
                if (alt != gspca_dev->alt) {
                        alt = gspca_dev->alt;
-                       if (gspca_dev->nbalt > 1) {
+                       if (intf->num_altsetting > 1) {
                                ret = usb_set_interface(gspca_dev->dev,
                                                        gspca_dev->iface,
                                                        alt);
@@ -2300,7 +2300,6 @@ int gspca_dev_probe2(struct usb_interface *intf,
        }
        gspca_dev->dev = dev;
        gspca_dev->iface = intf->cur_altsetting->desc.bInterfaceNumber;
-       gspca_dev->nbalt = intf->num_altsetting;
 
        /* check if any audio device */
        if (dev->config->desc.bNumInterfaces != 1) {

diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 65ddb84cacd9f5d8133b4ce27f6afeb531dce3f5..5f1f46c8e3731e5b5d1f6198d5c00c486df53a35 100644 (file)
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -207,7 +207,6 @@ struct gspca_dev {
        char memory;                    /* memory type (V4L2_MEMORY_xxx) */
        __u8 iface;                     /* USB interface number */
        __u8 alt;                       /* USB alternate setting */
-       __u8 nbalt;                     /* number of USB alternate settings */
        u8 audio;                       /* presence of audio device */
 };
 

diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index f3f7fe0ec4b721bb679b5a6b2299f3b079b7cb9b..494b05ed8f1a8f84cfe3bc8d7546e5189d8b6f5f 100644 (file)
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -247,9 +247,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        gspca_dev->cam.cam_mode = vga_mode;
        gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);
        gspca_dev->cam.no_urb_create = 1;
-       /* The highest alt setting has an isoc packetsize of 0, so we
-          don't want to use it */
-       gspca_dev->nbalt--;
 
        sd->brightness  = BRIGHTNESS_DEFAULT;
        sd->contrast    = CONTRAST_DEFAULT;

diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index ef45fa575752607823267946c38d17289e6c6d16..edd32793bb176feb4dd149cfaa4e78be9d8982c5 100644 (file)
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        cam->nmodes = ARRAY_SIZE(vga_mode);
        cam->ctrls = sd->ctrls;
        sd->quality = QUALITY_DEF;
-       gspca_dev->nbalt = 9;           /* use the altsetting 08 */
        return 0;
 }
 

diff --git a/drivers/media/video/gspca/se401.c b/drivers/media/video/gspca/se401.c
index 3b71bbcd977add2e91847ec6799bdefae4cedf80..6d9835342e0a1eed121eb7ada41257de7f81237b 100644 (file)
--- a/drivers/media/video/gspca/se401.c
+++ b/drivers/media/video/gspca/se401.c
@@ -376,7 +376,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        cam->bulk_size = BULK_SIZE;
        cam->bulk_nurbs = 4;
        cam->ctrls = sd->ctrls;
-       gspca_dev->nbalt = 1;  /* Ignore the bogus isoc alt settings */
        sd->resetlevel = 0x2d; /* Set initial resetlevel */
 
        /* See if the camera supports brightness */
@@ -395,6 +394,14 @@ static int sd_init(struct gspca_dev *gspca_dev)
        return 0;
 }
 
+/* function called at start time before URB creation */
+static int sd_isoc_init(struct gspca_dev *gspca_dev)
+{
+       gspca_dev->alt = 1;     /* Ignore the bogus isoc alt settings */
+
+       return gspca_dev->usb_err;
+}
+
 /* -- start the camera -- */
 static int sd_start(struct gspca_dev *gspca_dev)
 {
@@ -714,6 +721,7 @@ static const struct sd_desc sd_desc = {
        .nctrls = ARRAY_SIZE(sd_ctrls),
        .config = sd_config,
        .init = sd_init,
+       .isoc_init = sd_isoc_init,
        .start = sd_start,
        .stopN = sd_stopN,
        .dq_callback = sd_dq_callback,

diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index c746bf19ca14be56aa7172f180721b54ea71d993..ced16a073a8248ebf48d4675696d20b4e1e3db2e 100644 (file)
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -1779,10 +1779,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        sd->ag_cnt = -1;
        sd->quality = QUALITY_DEF;
 
-       /* if USB 1.1, let some bandwidth for the audio device */
-       if (gspca_dev->audio && gspca_dev->dev->speed < USB_SPEED_HIGH)
-               gspca_dev->nbalt--;
-
        INIT_WORK(&sd->work, qual_upd);
 
        return 0;

diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index c82fd53cef95bb3ee06975760fb02d6f100378d1..61743d4255849e7ff1698e2bf0c1736d881ebebc 100644 (file)
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -451,7 +451,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        }
 
        cam = &gspca_dev->cam;
-       gspca_dev->nbalt = 7 + 1;       /* choose alternate 7 first */
 
        sd->chip_revision = id->driver_info;
        if (sd->chip_revision == Rev012A) {

diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 30ea1e479492ecd814c973394e97938886ee7888..c4b8845b5f0bcc6896a67266052972c309cc3cf6 100644 (file)
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -6426,10 +6426,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
        gspca_dev->cam.ctrls = sd->ctrls;
        sd->quality = QUALITY_DEF;
 
-       /* if USB 1.1, let some bandwidth for the audio device */
-       if (gspca_dev->audio && gspca_dev->dev->speed < USB_SPEED_HIGH)
-               gspca_dev->nbalt--;
-
        return 0;
 }