git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git] / net / irda / irlan / irlan_provider_event.c
diff --git a/net/irda/irlan/irlan_provider_event.c b/net/irda/irlan/irlan_provider_event.c
index 5a086f9..01a9d7c 100644 (file)
--- a/net/irda/irlan/irlan_provider_event.c
+++ b/net/irda/irlan/irlan_provider_event.c
@@ -1,5 +1,5 @@
 /*********************************************************************
- *                
+ *
  * Filename:      irlan_provider_event.c
  * Version:       0.9
  * Description:   IrLAN provider state machine)
@@ -8,16 +8,16 @@
  * Created at:    Sun Aug 31 20:14:37 1997
  * Modified at:   Sat Oct 30 12:52:41 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * 
+ *
  *     Copyright (c) 1998-1999 Dag Brattli <dagb@cs.uit.no>, All Rights Reserved.
- *     
- *     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.
  *
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is 
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
+ *     provide warranty for any of this software. This material is
  *     provided "AS-IS" and at no charge.
  *
  ********************************************************************/
@@ -30,18 +30,18 @@
 #include <net/irda/irlan_provider.h>
 #include <net/irda/irlan_event.h>
 
-static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event, 
+static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb);
-static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event, 
+static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb);
-static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event, 
+static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb);
-static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event, 
+static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb);
 
-static int (*state[])(struct irlan_cb *self, IRLAN_EVENT event, 
-                     struct sk_buff *skb) = 
-{ 
+static int (*state[])(struct irlan_cb *self, IRLAN_EVENT event,
+                     struct sk_buff *skb) =
+{
        irlan_provider_state_idle,
        NULL, /* Query */
        NULL, /* Info */
@@ -55,8 +55,8 @@ static int (*state[])(struct irlan_cb *self, IRLAN_EVENT event,
        NULL, /* Sync */
 };
 
-void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event, 
-                            struct sk_buff *skb) 
+void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event,
+                            struct sk_buff *skb)
 {
        IRDA_ASSERT(*state[ self->provider.state] != NULL, return;);
 
@@ -72,17 +72,17 @@ void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb)
 {
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
-       
+       IRDA_DEBUG(4, "%s()\n", __func__ );
+
        IRDA_ASSERT(self != NULL, return -1;);
-       
+
        switch(event) {
        case IRLAN_CONNECT_INDICATION:
             irlan_provider_connect_response( self, self->provider.tsap_ctrl);
             irlan_next_provider_state( self, IRLAN_INFO);
             break;
        default:
-               IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+               IRDA_DEBUG(4, "%s(), Unknown event %d\n", __func__ , event);
                break;
        }
        if (skb)
@@ -96,13 +96,13 @@ static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
  *
  *    INFO, We have issued a GetInfo command and is awaiting a reply.
  */
-static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event, 
-                                    struct sk_buff *skb) 
+static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
+                                    struct sk_buff *skb)
 {
        int ret;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
-       
+       IRDA_DEBUG(4, "%s()\n", __func__ );
+
        IRDA_ASSERT(self != NULL, return -1;);
 
        switch(event) {
@@ -110,7 +110,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                /* Be sure to use 802.3 in case of peer mode */
                if (self->provider.access_type == ACCESS_PEER) {
                        self->media = MEDIA_802_3;
-                       
+
                        /* Check if client has started yet */
                        if (self->client.state == IRLAN_IDLE) {
                                /* This should get the client going */
@@ -118,15 +118,15 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                        }
                }
 
-               irlan_provider_send_reply(self, CMD_GET_PROVIDER_INFO, 
+               irlan_provider_send_reply(self, CMD_GET_PROVIDER_INFO,
                                          RSP_SUCCESS);
                /* Keep state */
                break;
-       case IRLAN_GET_MEDIA_CMD: 
-               irlan_provider_send_reply(self, CMD_GET_MEDIA_CHAR, 
+       case IRLAN_GET_MEDIA_CMD:
+               irlan_provider_send_reply(self, CMD_GET_MEDIA_CHAR,
                                          RSP_SUCCESS);
                /* Keep state */
-               break;          
+               break;
        case IRLAN_OPEN_DATA_CMD:
                ret = irlan_parse_open_data_cmd(self, skb);
                if (self->provider.access_type == ACCESS_PEER) {
@@ -147,12 +147,12 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                irlan_next_provider_state(self, IRLAN_IDLE);
                break;
        default:
-               IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+               IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event);
                break;
        }
        if (skb)
                dev_kfree_skb(skb);
-       
+
        return 0;
 }
 
@@ -163,21 +163,21 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
  *    reply
  *
  */
-static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event, 
+static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb)
 {
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return -1;);
 
        switch(event) {
        case IRLAN_FILTER_CONFIG_CMD:
                irlan_provider_parse_command(self, CMD_FILTER_OPERATION, skb);
-               irlan_provider_send_reply(self, CMD_FILTER_OPERATION, 
+               irlan_provider_send_reply(self, CMD_FILTER_OPERATION,
                                          RSP_SUCCESS);
                /* Keep state */
                break;
-       case IRLAN_DATA_CONNECT_INDICATION: 
+       case IRLAN_DATA_CONNECT_INDICATION:
                irlan_next_provider_state(self, IRLAN_DATA);
                irlan_provider_connect_response(self, self->tsap_data);
                break;
@@ -186,7 +186,7 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                irlan_next_provider_state(self, IRLAN_IDLE);
                break;
        default:
-               IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+               IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                break;
        }
        if (skb)
@@ -202,10 +202,10 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
  *    the local and remote machines.
  *
  */
-static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event, 
-                                    struct sk_buff *skb) 
+static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
+                                    struct sk_buff *skb)
 {
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -213,7 +213,7 @@ static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
        switch(event) {
        case IRLAN_FILTER_CONFIG_CMD:
                irlan_provider_parse_command(self, CMD_FILTER_OPERATION, skb);
-               irlan_provider_send_reply(self, CMD_FILTER_OPERATION, 
+               irlan_provider_send_reply(self, CMD_FILTER_OPERATION,
                                          RSP_SUCCESS);
                break;
        case IRLAN_LMP_DISCONNECT: /* FALLTHROUGH */
@@ -221,12 +221,12 @@ static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
                irlan_next_provider_state(self, IRLAN_IDLE);
                break;
        default:
-               IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+               IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event);
                break;
        }
        if (skb)
                dev_kfree_skb(skb);
-       
+
        return 0;
 }
 
Pandora Kernel Repository