net/irda: Use static const char * const where possible

[net-next-2.6.git] / net / irda / irlan / irlan_event.c

diff --git a/net/irda/irlan/irlan_event.c b/net/irda/irlan/irlan_event.c
index a9750a801388f6d2586852f81a9c8ca980f7582f..43f16040a6fe0f3016ae66136c84573e6d97be8f 100644 (file)
--- a/net/irda/irlan/irlan_event.c
+++ b/net/irda/irlan/irlan_event.c
@@ -24,7 +24,7 @@
 
 #include <net/irda/irlan_event.h>
 
-char *irlan_state[] = {
+const char * const irlan_state[] = {
        "IRLAN_IDLE",
        "IRLAN_QUERY",
        "IRLAN_CONN",
@@ -40,7 +40,7 @@ char *irlan_state[] = {
 
 void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-       IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
+       IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]);
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 
 void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-       IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
+       IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]);
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);