V4L/DVB (7627): au0828: replace __FUNCTION__ with __func__

replace __FUNCTION__ with __func__ and clean associated checkpatch.pl
warnings.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 25 insertions, 21 deletions

diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 453fb3efa3e0..8853f4e26092 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -49,7 +49,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,7 +58,8 @@ 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;
         }
 
@@ -78,7 +79,7 @@ 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++) {
@@ -100,10 +101,10 @@ 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;
         }
 
@@ -138,7 +139,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 +159,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 +187,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);
@@ -208,14 +210,14 @@ 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 +225,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 +259,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,7 +304,7 @@ 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)
                 return;
@@ -326,7 +328,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) {
@@ -344,11 +346,13 @@ int au0828_dvb_register(struct au0828_dev *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;
         }