net: replace remaining __FUNCTION__ occurrences

[mirror_ubuntu-artful-kernel.git] / net / irda / irnet / irnet.h

diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index ad6caba02a7be931439ae73f37f56c4b02a992ed..a00e422c822ed1c6444ca47f4a351e075c46db29 100644 (file)
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -44,7 +44,7 @@
  * the generic Linux PPP driver. Because IrNET depend on recent
  * changes of the PPP driver interface, IrNET will work only with very
  * recent kernel (2.3.99-pre6 and up).
- * 
+ *
  * The present implementation offer the following features :
  *     o simple user interface using pppd
  *     o efficient implementation (interface directly to PPP and IrTTP)
@@ -248,7 +248,6 @@
 #include <linux/miscdevice.h>
 #include <linux/poll.h>
 #include <linux/capability.h>
-#include <linux/config.h>
 #include <linux/ctype.h>       /* isspace() */
 #include <asm/uaccess.h>
 #include <linux/init.h>
@@ -328,7 +327,7 @@
 
 #define DEBUG_ASSERT           0       /* Verify all assertions */
 
-/* 
+/*
  * These are the macros we are using to actually print the debug
  * statements. Don't look at it, it's ugly...
  *
@@ -338,27 +337,27 @@
 /* All error messages (will show up in the normal logs) */
 #define DERROR(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_INFO "irnet: %s(): " format, __FUNCTION__ , ##args);}
+               printk(KERN_INFO "irnet: %s(): " format, __func__ , ##args);}
 
 /* Normal debug message (will show up in /var/log/debug) */
 #define DEBUG(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: %s(): " format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: %s(): " format, __func__ , ##args);}
 
 /* Entering a function (trace) */
 #define DENTER(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: -> %s" format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: -> %s" format, __func__ , ##args);}
 
 /* Entering and exiting a function in one go (trace) */
 #define DPASS(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: <>%s" format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: <>%s" format, __func__ , ##args);}
 
 /* Exiting a function (trace) */
 #define DEXIT(dbg, format, args...) \
        {if(DEBUG_##dbg) \
-               printk(KERN_DEBUG "irnet: <-%s()" format, __FUNCTION__ , ##args);}
+               printk(KERN_DEBUG "irnet: <-%s()" format, __func__ , ##args);}
 
 /* Exit a function with debug */
 #define DRETURN(ret, dbg, args...) \
@@ -420,7 +419,7 @@ typedef struct irnet_socket
   u32                  raccm;          /* to please pppd - dummy) */
   unsigned int         flags;          /* PPP flags (compression, ...) */
   unsigned int         rbits;          /* Unused receive flags ??? */
-
+  struct work_struct disconnect_work;   /* Process context disconnection */
   /* ------------------------ IrTTP part ------------------------ */
   /* We create a pseudo "socket" over the IrDA tranport */
   unsigned long                ttp_open;       /* Set when IrTTP is ready */