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

Commit fa9363c5 authored by Harvey Harrison's avatar Harvey Harrison Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 30ec910e

drivers/watchdog/machzwd.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static unsigned long next_heartbeat = 0; 
#ifndef ZF_DEBUG

#	define dprintk(format, args...)

#else

#	define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __FUNCTION__, __LINE__ , ## args)

#	define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __func__, __LINE__ , ## args)

#endif

drivers/watchdog/pcwd_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -179,11 +179,11 @@ static void usb_pcwd_intr_done(struct urb *urb) 
	case -ENOENT:

	case -ESHUTDOWN:

		/* this urb is terminated, clean up */

		dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);

		dbg("%s - urb shutting down with status: %d", __func__, urb->status);

		return;

	/* -EPIPE:  should clear the halt */

	default:		/* error */

		dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);

		dbg("%s - nonzero urb status received: %d", __func__, urb->status);

		goto resubmit;

	}

drivers/watchdog/s3c2410_wdt.c

+4 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int s3c2410wdt_start(void) 
	}



	DBG("%s: wdt_count=0x%08x, wtcon=%08lx\n",

	    __FUNCTION__, wdt_count, wtcon);

	    __func__, wdt_count, wtcon);



	writel(wdt_count, wdt_base + S3C2410_WTDAT);

	writel(wdt_count, wdt_base + S3C2410_WTCNT);
@@ -167,7 +167,7 @@ static int s3c2410wdt_set_heartbeat(int timeout) 
	count = timeout * freq;



	DBG("%s: count=%d, timeout=%d, freq=%d\n",

	    __FUNCTION__, count, timeout, freq);

	    __func__, count, timeout, freq);



	/* if the count is bigger than the watchdog register,

	   then work out what we need to do (and if) we can
@@ -189,7 +189,7 @@ static int s3c2410wdt_set_heartbeat(int timeout) 
	tmr_margin = timeout;



	DBG("%s: timeout=%d, divisor=%d, count=%d (%08x)\n",

	    __FUNCTION__, timeout, divisor, count, count/divisor);

	    __func__, timeout, divisor, count, count/divisor);



	count /= divisor;

	wdt_count = count;
@@ -355,7 +355,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) 
	int ret;

	int size;



	DBG("%s: probe=%p\n", __FUNCTION__, pdev);

	DBG("%s: probe=%p\n", __func__, pdev);



	dev = &pdev->dev;

	wdt_dev = &pdev->dev;

drivers/watchdog/shwdt.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int sh_wdt_mmap(struct file *file, struct vm_area_struct *vma) 
	if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,

			       PAGE_SIZE, vma->vm_page_prot)) {

		printk(KERN_ERR PFX "%s: io_remap_pfn_range failed\n",

		       __FUNCTION__);

		       __func__);

		return -EAGAIN;

	}