powerpc/pci: Properly allocate bus resources for hotplug PHBs

[linux-2.6-omap-h63xx.git] / net / irda / ircomm / ircomm_event.c

diff --git a/net/irda/ircomm/ircomm_event.c b/net/irda/ircomm/ircomm_event.c
index 23d0468794e2dca53c42693ed543d543c44512e3..c35b3ef5c2f083778728b33e0657a946b0f05bfe 100644 (file)
--- a/net/irda/ircomm/ircomm_event.c
+++ b/net/irda/ircomm/ircomm_event.c
@@ -28,7 +28,6 @@
  *
  ********************************************************************/
 
-#include <linux/sched.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 
@@ -109,7 +108,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event,
                ircomm_connect_indication(self, skb, info);
                break;
        default:
-               IRDA_DEBUG(4, "%s(), unknown event: %s\n", __FUNCTION__ ,
+               IRDA_DEBUG(4, "%s(), unknown event: %s\n", __func__ ,
                           ircomm_event[event]);
                ret = -EINVAL;
        }
@@ -139,7 +138,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event,
                ircomm_disconnect_indication(self, skb, info);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), unknown event: %s\n", __FUNCTION__ ,
+               IRDA_DEBUG(0, "%s(), unknown event: %s\n", __func__ ,
                           ircomm_event[event]);
                ret = -EINVAL;
        }
@@ -172,7 +171,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event,
                ircomm_disconnect_indication(self, skb, info);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
+               IRDA_DEBUG(0, "%s(), unknown event = %s\n", __func__ ,
                           ircomm_event[event]);
                ret = -EINVAL;
        }
@@ -214,7 +213,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
                ret = self->issue.disconnect_request(self, skb, info);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ ,
+               IRDA_DEBUG(0, "%s(), unknown event = %s\n", __func__ ,
                           ircomm_event[event]);
                ret = -EINVAL;
        }
@@ -230,7 +229,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event,
 int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event,
                    struct sk_buff *skb, struct ircomm_info *info)
 {
-       IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+       IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __func__ ,
                   ircomm_state[self->state], ircomm_event[event]);
 
        return (*state[self->state])(self, event, skb, info);
@@ -246,6 +245,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state)
 {
        self->state = state;
 
-       IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ ,
+       IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __func__ ,
                   ircomm_state[self->state], self->service_type);
 }