Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf9d8929 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

drivers/char: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e24eea7

drivers/char/agp/agp.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


//#define AGP_DEBUG 1

#ifdef AGP_DEBUG

#define DBG(x,y...) printk (KERN_DEBUG PFX "%s: " x "\n", __FUNCTION__ , ## y)

#define DBG(x,y...) printk (KERN_DEBUG PFX "%s: " x "\n", __func__ , ## y)

#else

#define DBG(x,y...) do { } while (0)

#endif

drivers/char/cyclades.c

+2 −2
Original line number Diff line number Diff line
@@ -3490,7 +3490,7 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file) 
	struct BOARD_CTRL __iomem *board_ctrl;

	struct CH_CTRL __iomem *ch_ctrl;



	if (serial_paranoia_check(info, tty->name, __FUNCTION__))

	if (serial_paranoia_check(info, tty->name, __func__))

		return -ENODEV;



	lock_kernel();
@@ -3561,7 +3561,7 @@ cy_tiocmset(struct tty_struct *tty, struct file *file, 
	struct CH_CTRL __iomem *ch_ctrl;

	int retval;



	if (serial_paranoia_check(info, tty->name, __FUNCTION__))

	if (serial_paranoia_check(info, tty->name, __func__))

		return -ENODEV;



	card = info->card;

drivers/char/drm/drmP.h

+4 −4
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ struct drm_device; 
 * \param arg arguments

 */

#define DRM_ERROR(fmt, arg...) \

	printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg)

	printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __func__ , ##arg)



/**

 * Memory error output.
@@ -170,7 +170,7 @@ struct drm_device; 
 * \param arg arguments

 */

#define DRM_MEM_ERROR(area, fmt, arg...) \

	printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \

	printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __func__, \

	       drm_mem_stats[area].name , ##arg)



#define DRM_INFO(fmt, arg...)  printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg)
@@ -187,7 +187,7 @@ struct drm_device; 
		if ( drm_debug )			\

			printk(KERN_DEBUG				\

			       "[" DRM_NAME ":%s] " fmt ,	\

			       __FUNCTION__ , ##arg);			\

			       __func__ , ##arg);			\

	} while (0)

#else

#define DRM_DEBUG(fmt, arg...)		 do { } while (0)
@@ -238,7 +238,7 @@ do { \ 
	if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||		\

	     dev->lock.file_priv != file_priv )	{			\

		DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\

			   __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\

			   __func__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\

			   dev->lock.file_priv, file_priv );		\

		return -EINVAL;						\

	}								\

drivers/char/drm/drm_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state) 
	struct drm_minor *drm_minor = to_drm_minor(dev);

	struct drm_device *drm_dev = drm_minor->dev;



	printk(KERN_ERR "%s\n", __FUNCTION__);

	printk(KERN_ERR "%s\n", __func__);



	if (drm_dev->driver->suspend)

		return drm_dev->driver->suspend(drm_dev, state);

drivers/char/drm/i830_dma.c

+9 −9
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static void i830EmitState(struct drm_device * dev) 
	drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv;

	unsigned int dirty = sarea_priv->dirty;



	DRM_DEBUG("%s %x\n", __FUNCTION__, dirty);

	DRM_DEBUG("%s %x\n", __func__, dirty);



	if (dirty & I830_UPLOAD_BUFFERS) {

		i830EmitDestVerified(dev, sarea_priv->BufferState);
@@ -1043,7 +1043,7 @@ static void i830_dma_dispatch_flip(struct drm_device * dev) 
	RING_LOCALS;



	DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",

		  __FUNCTION__,

		  __func__,

		  dev_priv->current_page,

		  dev_priv->sarea_priv->pf_current_page);
@@ -1206,7 +1206,7 @@ static void i830_dma_quiescent(struct drm_device * dev) 
	OUT_RING(0);

	ADVANCE_LP_RING();



	i830_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);

	i830_wait_ring(dev, dev_priv->ring.Size - 8, __func__);

}



static int i830_flush_queue(struct drm_device * dev)
@@ -1223,7 +1223,7 @@ static int i830_flush_queue(struct drm_device * dev) 
	OUT_RING(0);

	ADVANCE_LP_RING();



	i830_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);

	i830_wait_ring(dev, dev_priv->ring.Size - 8, __func__);



	for (i = 0; i < dma->buf_count; i++) {

		struct drm_buf *buf = dma->buflist[i];
@@ -1344,7 +1344,7 @@ static void i830_do_init_pageflip(struct drm_device * dev) 
{

	drm_i830_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("%s\n", __func__);

	dev_priv->page_flipping = 1;

	dev_priv->current_page = 0;

	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
@@ -1354,7 +1354,7 @@ static int i830_do_cleanup_pageflip(struct drm_device * dev) 
{

	drm_i830_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("%s\n", __func__);

	if (dev_priv->current_page != 0)

		i830_dma_dispatch_flip(dev);
@@ -1367,7 +1367,7 @@ static int i830_flip_bufs(struct drm_device *dev, void *data, 
{

	drm_i830_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("%s\n", __func__);



	LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -1437,7 +1437,7 @@ static int i830_getparam(struct drm_device *dev, void *data, 
	int value;



	if (!dev_priv) {

		DRM_ERROR("%s called with no initialization\n", __FUNCTION__);

		DRM_ERROR("%s called with no initialization\n", __func__);

		return -EINVAL;

	}
@@ -1464,7 +1464,7 @@ static int i830_setparam(struct drm_device *dev, void *data, 
	drm_i830_setparam_t *param = data;



	if (!dev_priv) {

		DRM_ERROR("%s called with no initialization\n", __FUNCTION__);

		DRM_ERROR("%s called with no initialization\n", __func__);

		return -EINVAL;

	}