]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - net/irda/ircomm/ircomm_ttp.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[mv-sheeva.git] / net / irda / ircomm / ircomm_ttp.c
index d98bf3570d290691ef8d9bb373da996f4725b20c..6e6509f22f60913296e9b8971e6304155a5f3b1c 100644 (file)
@@ -1,5 +1,5 @@
 /*********************************************************************
- *                
+ *
  * Filename:      ircomm_ttp.c
  * Version:       1.0
  * Description:   Interface between IrCOMM and IrTTP
@@ -8,28 +8,27 @@
  * Created at:    Sun Jun  6 20:48:27 1999
  * Modified at:   Mon Dec 13 11:35:13 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * 
+ *
  *     Copyright (c) 1999 Dag Brattli, All Rights Reserved.
  *     Copyright (c) 2000-2003 Jean Tourrilhes <jt@hpl.hp.com>
- *     
- *     This program is free software; you can redistribute it and/or 
- *     modify it under the terms of the GNU General Public License as 
- *     published by the Free Software Foundation; either version 2 of 
+ *
+ *     This program is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License 
- *     along with this program; if not, write to the Free Software 
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *     MA 02111-1307 USA
- *     
+ *
  ********************************************************************/
 
-#include <linux/sched.h>
 #include <linux/init.h>
 
 #include <net/irda/irda.h>
@@ -43,8 +42,8 @@
 static int ircomm_ttp_data_indication(void *instance, void *sap,
                                      struct sk_buff *skb);
 static void ircomm_ttp_connect_confirm(void *instance, void *sap,
-                                      struct qos_info *qos, 
-                                      __u32 max_sdu_size, 
+                                      struct qos_info *qos,
+                                      __u32 max_sdu_size,
                                       __u8 max_header_size,
                                       struct sk_buff *skb);
 static void ircomm_ttp_connect_indication(void *instance, void *sap,
@@ -54,32 +53,32 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap,
                                          struct sk_buff *skb);
 static void ircomm_ttp_flow_indication(void *instance, void *sap,
                                       LOCAL_FLOW cmd);
-static void ircomm_ttp_disconnect_indication(void *instance, void *sap, 
+static void ircomm_ttp_disconnect_indication(void *instance, void *sap,
                                             LM_REASON reason,
                                             struct sk_buff *skb);
 static int ircomm_ttp_data_request(struct ircomm_cb *self,
-                                  struct sk_buff *skb, 
+                                  struct sk_buff *skb,
                                   int clen);
-static int ircomm_ttp_connect_request(struct ircomm_cb *self, 
-                                     struct sk_buff *userdata, 
+static int ircomm_ttp_connect_request(struct ircomm_cb *self,
+                                     struct sk_buff *userdata,
                                      struct ircomm_info *info);
 static int ircomm_ttp_connect_response(struct ircomm_cb *self,
                                       struct sk_buff *userdata);
-static int ircomm_ttp_disconnect_request(struct ircomm_cb *self, 
-                                        struct sk_buff *userdata, 
+static int ircomm_ttp_disconnect_request(struct ircomm_cb *self,
+                                        struct sk_buff *userdata,
                                         struct ircomm_info *info);
 
 /*
  * Function ircomm_open_tsap (self)
  *
- *    
+ *
  *
  */
 int ircomm_open_tsap(struct ircomm_cb *self)
 {
        notify_t notify;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        /* Register callbacks */
        irda_notify_init(&notify);
@@ -94,7 +93,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
        self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT,
                                     &notify);
        if (!self->tsap) {
-               IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __FUNCTION__ );
+               IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __func__ );
                return -1;
        }
        self->slsap_sel = self->tsap->stsap_sel;
@@ -113,32 +112,32 @@ int ircomm_open_tsap(struct ircomm_cb *self)
 /*
  * Function ircomm_ttp_connect_request (self, userdata)
  *
- *    
+ *
  *
  */
-static int ircomm_ttp_connect_request(struct ircomm_cb *self, 
-                                     struct sk_buff *userdata, 
+static int ircomm_ttp_connect_request(struct ircomm_cb *self,
+                                     struct sk_buff *userdata,
                                      struct ircomm_info *info)
 {
        int ret = 0;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        /* Don't forget to refcount it - should be NULL anyway */
        if(userdata)
                skb_get(userdata);
 
        ret = irttp_connect_request(self->tsap, info->dlsap_sel,
-                                   info->saddr, info->daddr, NULL, 
-                                   TTP_SAR_DISABLE, userdata); 
+                                   info->saddr, info->daddr, NULL,
+                                   TTP_SAR_DISABLE, userdata);
 
        return ret;
-}      
+}
 
 /*
  * Function ircomm_ttp_connect_response (self, skb)
  *
- *    
+ *
  *
  */
 static int ircomm_ttp_connect_response(struct ircomm_cb *self,
@@ -146,8 +145,8 @@ static int ircomm_ttp_connect_response(struct ircomm_cb *self,
 {
        int ret;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
-       
+       IRDA_DEBUG(4, "%s()\n", __func__ );
+
        /* Don't forget to refcount it - should be NULL anyway */
        if(userdata)
                skb_get(userdata);
@@ -160,23 +159,23 @@ static int ircomm_ttp_connect_response(struct ircomm_cb *self,
 /*
  * Function ircomm_ttp_data_request (self, userdata)
  *
- *    Send IrCOMM data to IrTTP layer. Currently we do not try to combine 
- *    control data with pure data, so they will be sent as separate frames. 
+ *    Send IrCOMM data to IrTTP layer. Currently we do not try to combine
+ *    control data with pure data, so they will be sent as separate frames.
  *    Should not be a big problem though, since control frames are rare. But
- *    some of them are sent after connection establishment, so this can 
+ *    some of them are sent after connection establishment, so this can
  *    increase the latency a bit.
  */
 static int ircomm_ttp_data_request(struct ircomm_cb *self,
-                                  struct sk_buff *skb, 
+                                  struct sk_buff *skb,
                                   int clen)
 {
        int ret;
 
        IRDA_ASSERT(skb != NULL, return -1;);
 
-       IRDA_DEBUG(2, "%s(), clen=%d\n", __FUNCTION__ , clen);
+       IRDA_DEBUG(2, "%s(), clen=%d\n", __func__ , clen);
 
-       /* 
+       /*
         * Insert clen field, currently we either send data only, or control
         * only frames, to make things easier and avoid queueing
         */
@@ -191,7 +190,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self,
 
        ret = irttp_data_request(self->tsap, skb);
        if (ret) {
-               IRDA_ERROR("%s(), failed\n", __FUNCTION__);
+               IRDA_ERROR("%s(), failed\n", __func__);
                /* irttp_data_request already free the packet */
        }
 
@@ -209,8 +208,8 @@ static int ircomm_ttp_data_indication(void *instance, void *sap,
 {
        struct ircomm_cb *self = (struct ircomm_cb *) instance;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
-       
+       IRDA_DEBUG(4, "%s()\n", __func__ );
+
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
        IRDA_ASSERT(skb != NULL, return -1;);
@@ -224,15 +223,15 @@ static int ircomm_ttp_data_indication(void *instance, void *sap,
 }
 
 static void ircomm_ttp_connect_confirm(void *instance, void *sap,
-                                      struct qos_info *qos, 
-                                      __u32 max_sdu_size, 
+                                      struct qos_info *qos,
+                                      __u32 max_sdu_size,
                                       __u8 max_header_size,
                                       struct sk_buff *skb)
 {
        struct ircomm_cb *self = (struct ircomm_cb *) instance;
        struct ircomm_info info;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
@@ -241,7 +240,7 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap,
 
        if (max_sdu_size != TTP_SAR_DISABLE) {
                IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n",
-                          __FUNCTION__);
+                          __func__);
                goto out;
        }
 
@@ -261,7 +260,7 @@ out:
  * Function ircomm_ttp_connect_indication (instance, sap, qos, max_sdu_size,
  *                                         max_header_size, skb)
  *
- *    
+ *
  *
  */
 static void ircomm_ttp_connect_indication(void *instance, void *sap,
@@ -273,7 +272,7 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap,
        struct ircomm_cb *self = (struct ircomm_cb *)instance;
        struct ircomm_info info;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
@@ -282,7 +281,7 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap,
 
        if (max_sdu_size != TTP_SAR_DISABLE) {
                IRDA_ERROR("%s(), SAR not allowed for IrCOMM!\n",
-                          __FUNCTION__);
+                          __func__);
                goto out;
        }
 
@@ -301,11 +300,11 @@ out:
 /*
  * Function ircomm_ttp_disconnect_request (self, userdata, info)
  *
- *    
+ *
  *
  */
-static int ircomm_ttp_disconnect_request(struct ircomm_cb *self, 
-                                        struct sk_buff *userdata, 
+static int ircomm_ttp_disconnect_request(struct ircomm_cb *self,
+                                        struct sk_buff *userdata,
                                         struct ircomm_info *info)
 {
        int ret;
@@ -322,17 +321,17 @@ static int ircomm_ttp_disconnect_request(struct ircomm_cb *self,
 /*
  * Function ircomm_ttp_disconnect_indication (instance, sap, reason, skb)
  *
- *    
+ *
  *
  */
-static void ircomm_ttp_disconnect_indication(void *instance, void *sap, 
+static void ircomm_ttp_disconnect_indication(void *instance, void *sap,
                                             LM_REASON reason,
                                             struct sk_buff *skb)
 {
        struct ircomm_cb *self = (struct ircomm_cb *) instance;
        struct ircomm_info info;
 
-       IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(2, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
@@ -357,11 +356,11 @@ static void ircomm_ttp_flow_indication(void *instance, void *sap,
 {
        struct ircomm_cb *self = (struct ircomm_cb *) instance;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
-       
+
        if (self->notify.flow_indication)
                self->notify.flow_indication(self->notify.instance, self, cmd);
 }