diff options
Diffstat (limited to 'net/irda/ircomm/ircomm_event.c')
-rw-r--r-- | net/irda/ircomm/ircomm_event.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/irda/ircomm/ircomm_event.c b/net/irda/ircomm/ircomm_event.c index 8ba4e59ece16..c35b3ef5c2f0 100644 --- a/net/irda/ircomm/ircomm_event.c +++ b/net/irda/ircomm/ircomm_event.c | |||
@@ -108,7 +108,7 @@ static int ircomm_state_idle(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
108 | ircomm_connect_indication(self, skb, info); | 108 | ircomm_connect_indication(self, skb, info); |
109 | break; | 109 | break; |
110 | default: | 110 | default: |
111 | IRDA_DEBUG(4, "%s(), unknown event: %s\n", __FUNCTION__ , | 111 | IRDA_DEBUG(4, "%s(), unknown event: %s\n", __func__ , |
112 | ircomm_event[event]); | 112 | ircomm_event[event]); |
113 | ret = -EINVAL; | 113 | ret = -EINVAL; |
114 | } | 114 | } |
@@ -138,7 +138,7 @@ static int ircomm_state_waiti(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
138 | ircomm_disconnect_indication(self, skb, info); | 138 | ircomm_disconnect_indication(self, skb, info); |
139 | break; | 139 | break; |
140 | default: | 140 | default: |
141 | IRDA_DEBUG(0, "%s(), unknown event: %s\n", __FUNCTION__ , | 141 | IRDA_DEBUG(0, "%s(), unknown event: %s\n", __func__ , |
142 | ircomm_event[event]); | 142 | ircomm_event[event]); |
143 | ret = -EINVAL; | 143 | ret = -EINVAL; |
144 | } | 144 | } |
@@ -171,7 +171,7 @@ static int ircomm_state_waitr(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
171 | ircomm_disconnect_indication(self, skb, info); | 171 | ircomm_disconnect_indication(self, skb, info); |
172 | break; | 172 | break; |
173 | default: | 173 | default: |
174 | IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ , | 174 | IRDA_DEBUG(0, "%s(), unknown event = %s\n", __func__ , |
175 | ircomm_event[event]); | 175 | ircomm_event[event]); |
176 | ret = -EINVAL; | 176 | ret = -EINVAL; |
177 | } | 177 | } |
@@ -213,7 +213,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
213 | ret = self->issue.disconnect_request(self, skb, info); | 213 | ret = self->issue.disconnect_request(self, skb, info); |
214 | break; | 214 | break; |
215 | default: | 215 | default: |
216 | IRDA_DEBUG(0, "%s(), unknown event = %s\n", __FUNCTION__ , | 216 | IRDA_DEBUG(0, "%s(), unknown event = %s\n", __func__ , |
217 | ircomm_event[event]); | 217 | ircomm_event[event]); |
218 | ret = -EINVAL; | 218 | ret = -EINVAL; |
219 | } | 219 | } |
@@ -229,7 +229,7 @@ static int ircomm_state_conn(struct ircomm_cb *self, IRCOMM_EVENT event, | |||
229 | int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, | 229 | int ircomm_do_event(struct ircomm_cb *self, IRCOMM_EVENT event, |
230 | struct sk_buff *skb, struct ircomm_info *info) | 230 | struct sk_buff *skb, struct ircomm_info *info) |
231 | { | 231 | { |
232 | IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __FUNCTION__ , | 232 | IRDA_DEBUG(4, "%s: state=%s, event=%s\n", __func__ , |
233 | ircomm_state[self->state], ircomm_event[event]); | 233 | ircomm_state[self->state], ircomm_event[event]); |
234 | 234 | ||
235 | return (*state[self->state])(self, event, skb, info); | 235 | return (*state[self->state])(self, event, skb, info); |
@@ -245,6 +245,6 @@ void ircomm_next_state(struct ircomm_cb *self, IRCOMM_STATE state) | |||
245 | { | 245 | { |
246 | self->state = state; | 246 | self->state = state; |
247 | 247 | ||
248 | IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __FUNCTION__ , | 248 | IRDA_DEBUG(4, "%s: next state=%s, service type=%d\n", __func__ , |
249 | ircomm_state[self->state], self->service_type); | 249 | ircomm_state[self->state], self->service_type); |
250 | } | 250 | } |