From: Curtis McEnroe Date: Fri, 3 Jun 2011 00:33:31 +0000 (-0400) Subject: tm6000: Cleaned up code style in tm6000-dbv.c X-Git-Tag: next-20110726~5^2~512 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94b276619b5962e0af72182e214d5fccbb818621;p=karo-tx-linux.git tm6000: Cleaned up code style in tm6000-dbv.c Replaced usage of __FUNCTION__ with __func__ Signed-off-by: Curtis McEnroe Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c index ff04c89e45a3..0e0dfce05821 100644 --- a/drivers/staging/tm6000/tm6000-dvb.c +++ b/drivers/staging/tm6000/tm6000-dvb.c @@ -98,7 +98,7 @@ static void tm6000_urb_received(struct urb *urb) if (dev->dvb->streams > 0) { ret = usb_submit_urb(urb, GFP_ATOMIC); if (ret < 0) { - printk(KERN_ERR "tm6000: error %s\n", __FUNCTION__); + printk(KERN_ERR "tm6000: error %s\n", __func__); kfree(urb->transfer_buffer); usb_free_urb(urb); } @@ -111,7 +111,7 @@ int tm6000_start_stream(struct tm6000_core *dev) unsigned int pipe, size; struct tm6000_dvb *dvb = dev->dvb; - printk(KERN_INFO "tm6000: got start stream request %s\n", __FUNCTION__); + printk(KERN_INFO "tm6000: got start stream request %s\n", __func__); if (dev->mode != TM6000_MODE_DIGITAL) { tm6000_init_digital_mode(dev); @@ -145,7 +145,7 @@ int tm6000_start_stream(struct tm6000_core *dev) ret = usb_clear_halt(dev->udev, pipe); if (ret < 0) { printk(KERN_ERR "tm6000: error %i in %s during pipe reset\n", - ret, __FUNCTION__); + ret, __func__); return ret; } else printk(KERN_ERR "tm6000: pipe resetted\n"); @@ -185,7 +185,7 @@ int tm6000_start_feed(struct dvb_demux_feed *feed) struct dvb_demux *demux = feed->demux; struct tm6000_core *dev = demux->priv; struct tm6000_dvb *dvb = dev->dvb; - printk(KERN_INFO "tm6000: got start feed request %s\n", __FUNCTION__); + printk(KERN_INFO "tm6000: got start feed request %s\n", __func__); mutex_lock(&dvb->mutex); if (dvb->streams == 0) { @@ -205,7 +205,7 @@ int tm6000_stop_feed(struct dvb_demux_feed *feed) struct tm6000_core *dev = demux->priv; struct tm6000_dvb *dvb = dev->dvb; - printk(KERN_INFO "tm6000: got stop feed request %s\n", __FUNCTION__); + printk(KERN_INFO "tm6000: got stop feed request %s\n", __func__); mutex_lock(&dvb->mutex);