Merge branch 'linus' into x86/cleanups

[linux-2.6] / drivers / media / video / au0828 / au0828-dvb.c

diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 453fb3efa3e04a775852bdd2e7b8d4785f1e521a..c6d47059038029f6d039b071512a3f343d633043 100644 (file)
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -31,6 +31,9 @@
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
+#define _AU0828_BULKPIPE 0x83
+#define _BULKPIPESIZE 0xe522
+
 static struct au8522_config hauppauge_hvr950q_config = {
        .demod_address = 0x8e >> 1,
        .status_mode   = AU8522_DEMODLOCKING,
@@ -49,7 +52,7 @@ static void urb_completion(struct urb *purb)
        struct au0828_dev *dev = purb->context;
        int ptype = usb_pipetype(purb->pipe);
 
-       dprintk(2, "%s()\n", __FUNCTION__);
+       dprintk(2, "%s()\n", __func__);
 
        if (!dev)
                return;
@@ -58,14 +61,16 @@ static void urb_completion(struct urb *purb)
                return;
 
        if (ptype != PIPE_BULK) {
-               printk(KERN_ERR "%s() Unsupported URB type %d\n", __FUNCTION__, ptype);
+               printk(KERN_ERR "%s() Unsupported URB type %d\n",
+                      __func__, ptype);
                return;
        }
 
        ptr = (u8 *)purb->transfer_buffer;
 
        /* Feed the transport payload into the kernel demux */
-       dvb_dmx_swfilter_packets(&dev->dvb.demux, purb->transfer_buffer, purb->actual_length / 188);
+       dvb_dmx_swfilter_packets(&dev->dvb.demux,
+               purb->transfer_buffer, purb->actual_length / 188);
 
        /* Clean the buffer before we requeue */
        memset(purb->transfer_buffer, 0, URB_BUFSIZE);
@@ -78,9 +83,8 @@ static int stop_urb_transfer(struct au0828_dev *dev)
 {
        int i;
 
-       dprintk(2, "%s()\n", __FUNCTION__);
+       dprintk(2, "%s()\n", __func__);
 
-       /* FIXME:  Do we need to free the transfer_buffers? */
        for (i = 0; i < URB_COUNT; i++) {
                usb_kill_urb(dev->urbs[i]);
                kfree(dev->urbs[i]->transfer_buffer);
@@ -92,34 +96,30 @@ static int stop_urb_transfer(struct au0828_dev *dev)
        return 0;
 }
 
-#define _AU0828_BULKPIPE 0x83
-#define _BULKPIPESIZE 0xe522
-
 static int start_urb_transfer(struct au0828_dev *dev)
 {
        struct urb *purb;
        int i, ret = -ENOMEM;
 
-       dprintk(2, "%s()\n", __FUNCTION__);
+       dprintk(2, "%s()\n", __func__);
 
        if (dev->urb_streaming) {
-               dprintk(2, "%s: iso xfer already running!\n", __FUNCTION__);
+               dprintk(2, "%s: iso xfer already running!\n", __func__);
                return 0;
        }
 
        for (i = 0; i < URB_COUNT; i++) {
 
                dev->urbs[i] = usb_alloc_urb(0, GFP_KERNEL);
-               if (!dev->urbs[i]) {
+               if (!dev->urbs[i])
                        goto err;
-               }
 
                purb = dev->urbs[i];
 
                purb->transfer_buffer = kzalloc(URB_BUFSIZE, GFP_KERNEL);
                if (!purb->transfer_buffer) {
                        usb_free_urb(purb);
-                       dev->urbs[i] = 0;
+                       dev->urbs[i] = NULL;
                        goto err;
                }
 
@@ -138,7 +138,8 @@ static int start_urb_transfer(struct au0828_dev *dev)
                ret = usb_submit_urb(dev->urbs[i], GFP_ATOMIC);
                if (ret != 0) {
                        stop_urb_transfer(dev);
-                       printk("%s: failed urb submission, err = %d\n", __FUNCTION__, ret);
+                       printk(KERN_ERR "%s: failed urb submission, "
+                              "err = %d\n", __func__, ret);
                        return ret;
                }
        }
@@ -157,7 +158,7 @@ static int au0828_dvb_start_feed(struct dvb_demux_feed *feed)
        struct au0828_dvb *dvb = &dev->dvb;
        int ret = 0;
 
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        if (!demux->dmx.frontend)
                return -EINVAL;
@@ -185,7 +186,7 @@ static int au0828_dvb_stop_feed(struct dvb_demux_feed *feed)
        struct au0828_dvb *dvb = &dev->dvb;
        int ret = 0;
 
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        if (dvb) {
                mutex_lock(&dvb->lock);
@@ -203,19 +204,19 @@ static int au0828_dvb_stop_feed(struct dvb_demux_feed *feed)
        return ret;
 }
 
-int dvb_register(struct au0828_dev *dev)
+static int dvb_register(struct au0828_dev *dev)
 {
        struct au0828_dvb *dvb = &dev->dvb;
        int result;
 
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        /* register adapter */
        result = dvb_register_adapter(&dvb->adapter, DRIVER_NAME, THIS_MODULE,
                                      &dev->usbdev->dev, adapter_nr);
        if (result < 0) {
-               printk(KERN_ERROR "%s: dvb_register_adapter failed (errno = %d)\n",
-                      DRIVER_NAME, result);
+               printk(KERN_ERR "%s: dvb_register_adapter failed "
+                      "(errno = %d)\n", DRIVER_NAME, result);
                goto fail_adapter;
        }
        dvb->adapter.priv = dev;
@@ -223,8 +224,8 @@ int dvb_register(struct au0828_dev *dev)
        /* register frontend */
        result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
        if (result < 0) {
-               printk(KERN_ERR "%s: dvb_register_frontend failed (errno = %d)\n",
-                      DRIVER_NAME, result);
+               printk(KERN_ERR "%s: dvb_register_frontend failed "
+                      "(errno = %d)\n", DRIVER_NAME, result);
                goto fail_frontend;
        }
 
@@ -257,16 +258,16 @@ int dvb_register(struct au0828_dev *dev)
        dvb->fe_hw.source = DMX_FRONTEND_0;
        result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
        if (result < 0) {
-               printk(KERN_ERR "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
-                      DRIVER_NAME, result);
+               printk(KERN_ERR "%s: add_frontend failed "
+                      "(DMX_FRONTEND_0, errno = %d)\n", DRIVER_NAME, result);
                goto fail_fe_hw;
        }
 
        dvb->fe_mem.source = DMX_MEMORY_FE;
        result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
        if (result < 0) {
-               printk(KERN_ERR "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
-                      DRIVER_NAME, result);
+               printk(KERN_ERR "%s: add_frontend failed "
+                      "(DMX_MEMORY_FE, errno = %d)\n", DRIVER_NAME, result);
                goto fail_fe_mem;
        }
 
@@ -302,9 +303,9 @@ void au0828_dvb_unregister(struct au0828_dev *dev)
 {
        struct au0828_dvb *dvb = &dev->dvb;
 
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
-       if(dvb->frontend == NULL)
+       if (dvb->frontend == NULL)
                return;
 
        dvb_net_release(&dvb->net);
@@ -326,7 +327,7 @@ int au0828_dvb_register(struct au0828_dev *dev)
        struct au0828_dvb *dvb = &dev->dvb;
        int ret;
 
-       dprintk(1, "%s()\n", __FUNCTION__);
+       dprintk(1, "%s()\n", __func__);
 
        /* init frontend */
        switch (dev->board) {
@@ -336,28 +337,22 @@ int au0828_dvb_register(struct au0828_dev *dev)
                dvb->frontend = dvb_attach(au8522_attach,
                                &hauppauge_hvr950q_config,
                                &dev->i2c_adap);
-               if (dvb->frontend != NULL) {
-                       hauppauge_hvr950q_tunerconfig.priv = dev;
+               if (dvb->frontend != NULL)
                        dvb_attach(xc5000_attach, dvb->frontend,
                                &dev->i2c_adap,
-                               &hauppauge_hvr950q_tunerconfig);
-               }
+                               &hauppauge_hvr950q_tunerconfig, dev);
                break;
        default:
-               printk("The frontend of your DVB/ATSC card isn't supported yet\n");
+               printk(KERN_WARNING "The frontend of your DVB/ATSC card "
+                      "isn't supported yet\n");
                break;
        }
        if (NULL == dvb->frontend) {
-               printk(KERN_ERR "%s() Frontend initialization failed\n", __FUNCTION__);
+               printk(KERN_ERR "%s() Frontend initialization failed\n",
+                      __func__);
                return -1;
        }
 
-       /* Put the analog decoder in standby to keep it quiet */
-       au0828_call_i2c_clients(dev, TUNER_SET_STANDBY, NULL);
-
-       if (dvb->frontend->ops.analog_ops.standby)
-               dvb->frontend->ops.analog_ops.standby(dvb->frontend);
-
        /* register everything */
        ret = dvb_register(dev);
        if (ret < 0) {