Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / net / irda / irlan / irlan_client.c

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index a4c1c954582787ced123a932d0c3f8acc5b48f18..6be1ec26b30cc81cca52309d241dd515105b4cf2 100644 (file)
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -20,7 +20,7 @@
  *     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
+ *     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.
  *
@@ -72,7 +72,7 @@ static void irlan_client_kick_timer_expired(void *data)
 {
        struct irlan_cb *self = (struct irlan_cb *) data;
 
-       IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(2, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -91,7 +91,7 @@ static void irlan_client_kick_timer_expired(void *data)
 
 static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
 {
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
                         irlan_client_kick_timer_expired);
@@ -105,7 +105,7 @@ static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
  */
 void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
 {
-       IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(1, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -117,7 +117,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
        if ((self->client.state != IRLAN_IDLE) ||
            (self->provider.access_type == ACCESS_DIRECT))
        {
-                       IRDA_DEBUG(0, "%s(), already awake!\n", __FUNCTION__ );
+                       IRDA_DEBUG(0, "%s(), already awake!\n", __func__ );
                        return;
        }
 
@@ -126,7 +126,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
        self->daddr = daddr;
 
        if (self->disconnect_reason == LM_USER_REQUEST) {
-                       IRDA_DEBUG(0, "%s(), still stopped by user\n", __FUNCTION__ );
+                       IRDA_DEBUG(0, "%s(), still stopped by user\n", __func__ );
                        return;
        }
 
@@ -153,7 +153,7 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
        struct irlan_cb *self;
        __u32 saddr, daddr;
 
-       IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(1, "%s()\n", __func__ );
 
        IRDA_ASSERT(discovery != NULL, return;);
 
@@ -175,7 +175,7 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
        if (self) {
                IRDA_ASSERT(self->magic == IRLAN_MAGIC, goto out;);
 
-               IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ ,
+               IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __func__ ,
                      daddr);
 
                irlan_client_wakeup(self, saddr, daddr);
@@ -195,7 +195,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
 {
        struct irlan_cb *self;
 
-       IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(2, "%s()\n", __func__ );
 
        self = (struct irlan_cb *) instance;
 
@@ -206,7 +206,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
        irlan_do_client_event(self, IRLAN_DATA_INDICATION, skb);
 
        /* Ready for a new command */
-       IRDA_DEBUG(2, "%s(), clearing tx_busy\n", __FUNCTION__ );
+       IRDA_DEBUG(2, "%s(), clearing tx_busy\n", __func__ );
        self->client.tx_busy = FALSE;
 
        /* Check if we have some queued commands waiting to be sent */
@@ -223,7 +223,7 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
        struct tsap_cb *tsap;
        struct sk_buff *skb;
 
-       IRDA_DEBUG(4, "%s(), reason=%d\n", __FUNCTION__ , reason);
+       IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
 
        self = (struct irlan_cb *) instance;
        tsap = (struct tsap_cb *) sap;
@@ -255,7 +255,7 @@ static void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
        struct tsap_cb *tsap;
        notify_t notify;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -275,7 +275,7 @@ static void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
 
        tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
        if (!tsap) {
-               IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
+               IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ );
                return;
        }
        self->client.tsap_ctrl = tsap;
@@ -295,7 +295,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
 {
        struct irlan_cb *self;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        self = (struct irlan_cb *) instance;
 
@@ -374,13 +374,13 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
 
        IRDA_ASSERT(skb != NULL, return;);
 
-       IRDA_DEBUG(4, "%s() skb->len=%d\n", __FUNCTION__ , (int) skb->len);
+       IRDA_DEBUG(4, "%s() skb->len=%d\n", __func__ , (int) skb->len);
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
        if (!skb) {
-               IRDA_ERROR("%s(), Got NULL skb!\n", __FUNCTION__);
+               IRDA_ERROR("%s(), Got NULL skb!\n", __func__);
                return;
        }
        frame = skb->data;
@@ -405,7 +405,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
        /* How many parameters? */
        count = frame[1];
 
-       IRDA_DEBUG(4, "%s(), got %d parameters\n", __FUNCTION__ , count);
+       IRDA_DEBUG(4, "%s(), got %d parameters\n", __func__ , count);
 
        ptr = frame+2;
 
@@ -413,7 +413,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
        for (i=0; i<count;i++) {
                ret = irlan_extract_param(ptr, name, value, &val_len);
                if (ret < 0) {
-                       IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __FUNCTION__ );
+                       IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __func__ );
                        break;
                }
                ptr += ret;
@@ -436,8 +436,9 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
        __u16 tmp_cpu; /* Temporary value in host order */
        __u8 *bytes;
        int i;
+       DECLARE_MAC_BUF(mac);
 
-       IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
+       IRDA_DEBUG(4, "%s(), parm=%s\n", __func__ , param);
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -475,7 +476,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
                else if (strcmp(value, "HOSTED") == 0)
                        self->client.access_type = ACCESS_HOSTED;
                else {
-                       IRDA_DEBUG(2, "%s(), unknown access type!\n", __FUNCTION__ );
+                       IRDA_DEBUG(2, "%s(), unknown access type!\n", __func__ );
                }
        }
        /* IRLAN version */
@@ -497,14 +498,14 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
                memcpy(&tmp_cpu, value, 2); /* Align value */
                le16_to_cpus(&tmp_cpu);     /* Convert to host order */
                self->client.recv_arb_val = tmp_cpu;
-               IRDA_DEBUG(2, "%s(), receive arb val=%d\n", __FUNCTION__ ,
+               IRDA_DEBUG(2, "%s(), receive arb val=%d\n", __func__ ,
                           self->client.recv_arb_val);
        }
        if (strcmp(param, "MAX_FRAME") == 0) {
                memcpy(&tmp_cpu, value, 2); /* Align value */
                le16_to_cpus(&tmp_cpu);     /* Convert to host order */
                self->client.max_frame = tmp_cpu;
-               IRDA_DEBUG(4, "%s(), max frame=%d\n", __FUNCTION__ ,
+               IRDA_DEBUG(4, "%s(), max frame=%d\n", __func__ ,
                           self->client.max_frame);
        }
 
@@ -520,9 +521,8 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
        /* FILTER_ENTRY, have we got an ethernet address? */
        if (strcmp(param, "FILTER_ENTRY") == 0) {
                bytes = value;
-               IRDA_DEBUG(4, "Ethernet address = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                     bytes[0], bytes[1], bytes[2], bytes[3], bytes[4],
-                     bytes[5]);
+               IRDA_DEBUG(4, "Ethernet address = %s\n",
+                          print_mac(mac, bytes));
                for (i = 0; i < 6; i++)
                        self->dev->dev_addr[i] = bytes[i];
        }
@@ -539,7 +539,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
 {
        struct irlan_cb *self;
 
-       IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+       IRDA_DEBUG(4, "%s()\n", __func__ );
 
        IRDA_ASSERT(priv != NULL, return;);
 
@@ -552,7 +552,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
 
        /* Check if request succeeded */
        if (result != IAS_SUCCESS) {
-               IRDA_DEBUG(2, "%s(), got NULL value!\n", __FUNCTION__ );
+               IRDA_DEBUG(2, "%s(), got NULL value!\n", __func__ );
                irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL,
                                      NULL);
                return;
@@ -570,7 +570,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
                irias_delete_value(value);
                break;
        default:
-               IRDA_DEBUG(2, "%s(), unknown type!\n", __FUNCTION__ );
+               IRDA_DEBUG(2, "%s(), unknown type!\n", __func__ );
                break;
        }
        irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, NULL);