[media] em28xx: rename some USB parameter fields in struct em28xx to clarify their...

Also improve the comments.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index bfce34d491c02c9bf770ce32b47f57a210822f75..873b52f71ab2307e67726009e4643462dd87cce3 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3183,9 +3183,10 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        }
 
        /* compute alternate max packet sizes */
-       dev->alt_max_pkt_size = kmalloc(sizeof(dev->alt_max_pkt_size[0]) *
+       dev->alt_max_pkt_size_isoc =
+                               kmalloc(sizeof(dev->alt_max_pkt_size_isoc[0]) *
                                        interface->num_altsetting, GFP_KERNEL);
-       if (dev->alt_max_pkt_size == NULL) {
+       if (dev->alt_max_pkt_size_isoc == NULL) {
                em28xx_errdev("out of memory!\n");
                kfree(dev);
                retval = -ENOMEM;
@@ -3216,13 +3217,14 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                                        break;
                                case EM28XX_EP_ANALOG:
                                        has_video = true;
-                                       dev->alt_max_pkt_size[i] = size;
+                                       dev->alt_max_pkt_size_isoc[i] = size;
                                        break;
                                case EM28XX_EP_DIGITAL:
                                        has_dvb = true;
-                                       if (size > dev->dvb_max_pkt_size) {
-                                               dev->dvb_max_pkt_size = size;
-                                               dev->dvb_alt = i;
+                                       if (size > dev->dvb_max_pkt_size_isoc) {
+                                               dev->dvb_max_pkt_size_isoc =
+                                                                         size;
+                                               dev->dvb_alt_isoc = i;
                                        }
                                        break;
                                }
@@ -3324,7 +3326,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                /* pre-allocate DVB isoc transfer buffers */
                retval = em28xx_alloc_urbs(dev, EM28XX_DIGITAL_MODE, 0,
                                           EM28XX_DVB_NUM_BUFS,
-                                          dev->dvb_max_pkt_size,
+                                          dev->dvb_max_pkt_size_isoc,
                                           EM28XX_DVB_NUM_ISOC_PACKETS);
                if (retval) {
                        goto unlock_and_free;
@@ -3344,7 +3346,7 @@ unlock_and_free:
        mutex_unlock(&dev->lock);
 
 err_free:
-       kfree(dev->alt_max_pkt_size);
+       kfree(dev->alt_max_pkt_size_isoc);
        kfree(dev);
 
 err:
@@ -3409,7 +3411,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
        em28xx_close_extension(dev);
 
        if (!dev->users) {
-               kfree(dev->alt_max_pkt_size);
+               kfree(dev->alt_max_pkt_size_isoc);
                kfree(dev);
        }
 }

diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 6b3485d2266ad014b095b43530b87db506b06e9a..3c40a1da69b642ed3262bf98dc80cee7f557813c 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -830,14 +830,14 @@ int em28xx_set_alternate(struct em28xx *dev)
 
        for (i = 0; i < dev->num_alt; i++) {
                /* stop when the selected alt setting offers enough bandwidth */
-               if (dev->alt_max_pkt_size[i] >= min_pkt_size) {
+               if (dev->alt_max_pkt_size_isoc[i] >= min_pkt_size) {
                        dev->alt = i;
                        break;
                /* otherwise make sure that we end up with the maximum bandwidth
                   because the min_pkt_size equation might be wrong...
                */
-               } else if (dev->alt_max_pkt_size[i] >
-                          dev->alt_max_pkt_size[dev->alt])
+               } else if (dev->alt_max_pkt_size_isoc[i] >
+                          dev->alt_max_pkt_size_isoc[dev->alt])
                        dev->alt = i;
        }
 
@@ -845,7 +845,7 @@ set_alt:
        if (dev->alt != prev_alt) {
                em28xx_coredbg("minimum isoc packet size: %u (alt=%d)\n",
                                min_pkt_size, dev->alt);
-               dev->max_pkt_size = dev->alt_max_pkt_size[dev->alt];
+               dev->max_pkt_size = dev->alt_max_pkt_size_isoc[dev->alt];
                em28xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n",
                               dev->alt, dev->max_pkt_size);
                errCode = usb_set_interface(dev->udev, 0, dev->alt);

diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 22ef6dd128e2f4d16f706cdfa78483ec6f7a75eb..24962520df802d1db9e0c5185e4cb985c06874a5 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -178,12 +178,12 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
        struct em28xx *dev = dvb->adapter.priv;
        int max_dvb_packet_size;
 
-       usb_set_interface(dev->udev, 0, dev->dvb_alt);
+       usb_set_interface(dev->udev, 0, dev->dvb_alt_isoc);
        rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
        if (rc < 0)
                return rc;
 
-       max_dvb_packet_size = dev->dvb_max_pkt_size;
+       max_dvb_packet_size = dev->dvb_max_pkt_size_isoc;
        if (max_dvb_packet_size < 0)
                return max_dvb_packet_size;
        dprintk(1, "Using %d buffers each with %d x %d bytes\n",

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index df294f3858ea8cac4b93da2b612c61b657572b1b..d9c15b6da1afbd101228d6ee9bdb3c8924cafef8 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -2286,7 +2286,7 @@ static int em28xx_v4l2_close(struct file *filp)
                   free the remaining resources */
                if (dev->state & DEV_DISCONNECTED) {
                        em28xx_release_resources(dev);
-                       kfree(dev->alt_max_pkt_size);
+                       kfree(dev->alt_max_pkt_size_isoc);
                        mutex_unlock(&dev->lock);
                        kfree(dev);
                        kfree(fh);

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 950a71786a14c015a07207e26e8167b6334acb45..6b8d3e6b69204322a5c803c65f2690dbd42584ff 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -4,6 +4,7 @@
    Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
                      Ludovico Cavedon <cavedon@sssup.it>
                      Mauro Carvalho Chehab <mchehab@infradead.org>
+   Copyright (C) 2012 Frank Schäfer <fschaefer.oss@googlemail.com>
 
    Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
 
@@ -583,12 +584,13 @@ struct em28xx {
 
        /* usb transfer */
        struct usb_device *udev;        /* the usb device */
-       int alt;                /* alternate */
-       int max_pkt_size;       /* max packet size of isoc transaction */
-       int num_alt;            /* Number of alternative settings */
-       unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */
-       int dvb_alt;                            /* alternate for DVB */
-       unsigned int dvb_max_pkt_size;          /* wMaxPacketSize for DVB */
+       int alt;                /* alternate setting */
+       int max_pkt_size;       /* max packet size of the selected ep at alt */
+       int num_alt;            /* number of alternative settings */
+       unsigned int *alt_max_pkt_size_isoc; /* array of isoc wMaxPacketSize */
+       int dvb_alt_isoc;       /* alternate setting for DVB isoc transfers */
+       unsigned int dvb_max_pkt_size_isoc;     /* isoc max packet size of the
+                                                  selected DVB ep at dvb_alt */
        char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
 
        /* helper funcs that call usb_control_msg */