--- drivers/media/video/cpia_usb.c-2.5.33 Sat May 25 22:50:00 2002
+++ drivers/media/video/cpia_usb.c Sun Sep 1 02:57:14 2002
@@ -167,7 +167,7 @@
/* resubmit */
urb->dev = ucpia->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
- printk(KERN_ERR __FUNCTION__ ": usb_submit_urb ret %d\n", i);
+ printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __FUNCTION__, i);
}
static int cpia_usb_open(void *privdata)
--- drivers/media/video/cpia.h-2.5.33 Thu Oct 25 22:53:47 2001
+++ drivers/media/video/cpia.h Sun Sep 1 02:55:55 2002
@@ -379,7 +379,7 @@
#define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */
#define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args)
-#define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":"__FUNCTION__"(%d):"fmt,##args)
+#define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":%s(%d):"fmt, __FUNCTION__, ##args)
#ifdef _CPIA_DEBUG_
#define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args)