Commit 4a9bdcd1 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] numerous __FUNCTION__ pasting fixes

parent b8ba9914
...@@ -330,8 +330,8 @@ MODULE_PARM(fs_keystream, "i"); ...@@ -330,8 +330,8 @@ MODULE_PARM(fs_keystream, "i");
#define FS_DEBUG_QSIZE 0x00001000 #define FS_DEBUG_QSIZE 0x00001000
#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter " __FUNCTION__ "\n") #define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__)
#define func_exit() fs_dprintk (FS_DEBUG_FLOW, "fs: exit " __FUNCTION__ "\n") #define func_exit() fs_dprintk (FS_DEBUG_FLOW, "fs: exit %s\n", __FUNCTION__)
struct fs_dev *fs_boards = NULL; struct fs_dev *fs_boards = NULL;
......
...@@ -41,8 +41,8 @@ static int gs_debug; ...@@ -41,8 +41,8 @@ static int gs_debug;
#define gs_dprintk(f, str...) /* nothing */ #define gs_dprintk(f, str...) /* nothing */
#endif #endif
#define func_enter() gs_dprintk (GS_DEBUG_FLOW, "gs: enter " __FUNCTION__ "\n") #define func_enter() gs_dprintk (GS_DEBUG_FLOW, "gs: enter %s\n", __FUNCTION__)
#define func_exit() gs_dprintk (GS_DEBUG_FLOW, "gs: exit " __FUNCTION__ "\n") #define func_exit() gs_dprintk (GS_DEBUG_FLOW, "gs: exit %s\n", __FUNCTION__)
#if NEW_WRITE_LOCKING #if NEW_WRITE_LOCKING
#define DECL /* Nothing */ #define DECL /* Nothing */
......
...@@ -404,11 +404,11 @@ static struct real_driver sx_real_driver = { ...@@ -404,11 +404,11 @@ static struct real_driver sx_real_driver = {
#define func_enter() sx_dprintk (SX_DEBUG_FLOW, "sx: enter " __FUNCTION__ "\n") #define func_enter() sx_dprintk (SX_DEBUG_FLOW, "sx: enter %s\b",__FUNCTION__)
#define func_exit() sx_dprintk (SX_DEBUG_FLOW, "sx: exit " __FUNCTION__ "\n") #define func_exit() sx_dprintk (SX_DEBUG_FLOW, "sx: exit %s\n", __FUNCTION__)
#define func_enter2() sx_dprintk (SX_DEBUG_FLOW, "sx: enter " __FUNCTION__ \ #define func_enter2() sx_dprintk (SX_DEBUG_FLOW, "sx: enter %s (port %d)\n", \
"(port %d)\n", port->line) __FUNCTION__, port->line)
......
...@@ -379,7 +379,7 @@ void cpia_unregister_camera(struct cam_data *cam); ...@@ -379,7 +379,7 @@ void cpia_unregister_camera(struct cam_data *cam);
#define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */ #define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */
#define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args) #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_ #ifdef _CPIA_DEBUG_
#define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args) #define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args)
......
...@@ -167,7 +167,7 @@ static void cpia_usb_complete(struct urb *urb) ...@@ -167,7 +167,7 @@ static void cpia_usb_complete(struct urb *urb)
/* resubmit */ /* resubmit */
urb->dev = ucpia->dev; urb->dev = ucpia->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0) 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) static int cpia_usb_open(void *privdata)
......
This diff is collapsed.
...@@ -423,9 +423,9 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len) ...@@ -423,9 +423,9 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len)
/* Verify firmware module format version */ /* Verify firmware module format version */
if (cfm->version != CFM_VERSION) { if (cfm->version != CFM_VERSION) {
printk(KERN_ERR "%s:" __FUNCTION__ ": firmware format %u rejected! " printk(KERN_ERR "%s:%s: firmware format %u rejected! "
"Expecting %u.\n", "Expecting %u.\n",
modname, cfm->version, CFM_VERSION); modname, __FUNCTION__, cfm->version, CFM_VERSION);
return -EINVAL; return -EINVAL;
} }
...@@ -437,8 +437,8 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len) ...@@ -437,8 +437,8 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len)
if (((len - sizeof(cfm_t) - 1) != cfm->info.codesize) || if (((len - sizeof(cfm_t) - 1) != cfm->info.codesize) ||
*/ */
if (cksum != cfm->checksum) { if (cksum != cfm->checksum) {
printk(KERN_ERR "%s:" __FUNCTION__ ": firmware corrupted!\n", printk(KERN_ERR "%s:%s: firmware corrupted!\n",
modname); modname, __FUNCTION__);
printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n", printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n",
len - sizeof(cfm_t) - 1, cfm->info.codesize); len - sizeof(cfm_t) - 1, cfm->info.codesize);
printk(KERN_ERR " chksum = 0x%x (expected 0x%x)\n", printk(KERN_ERR " chksum = 0x%x (expected 0x%x)\n",
...@@ -450,7 +450,7 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len) ...@@ -450,7 +450,7 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len)
img_hdr = (cycx_header_t*)(((u8*)cfm) + sizeof(cfm_t) - 1); img_hdr = (cycx_header_t*)(((u8*)cfm) + sizeof(cfm_t) - 1);
#ifdef FIRMWARE_DEBUG #ifdef FIRMWARE_DEBUG
printk(KERN_INFO "%s:" __FUNCTION__ ": image sizes\n", modname); printk(KERN_INFO "%s:%s: image sizes\n", __FUNCTION__, modname);
printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size); printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size);
printk(KERN_INFO " data=%lu\n", img_hdr->data_size); printk(KERN_INFO " data=%lu\n", img_hdr->data_size);
printk(KERN_INFO " code=%lu\n", img_hdr->code_size); printk(KERN_INFO " code=%lu\n", img_hdr->code_size);
......
...@@ -1446,7 +1446,7 @@ static void chan_x25_send_event(struct net_device *dev, u8 event) ...@@ -1446,7 +1446,7 @@ static void chan_x25_send_event(struct net_device *dev, u8 event)
unsigned char *ptr; unsigned char *ptr;
if ((skb = dev_alloc_skb(1)) == NULL) { if ((skb = dev_alloc_skb(1)) == NULL) {
printk(KERN_ERR __FUNCTION__ ": out of memory\n"); printk(KERN_ERR "%s: out of memory\n", __FUNCTION__);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment