diff options
Diffstat (limited to 'net/irda/irlan/irlan_provider_event.c')
-rw-r--r-- | net/irda/irlan/irlan_provider_event.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/irda/irlan/irlan_provider_event.c b/net/irda/irlan/irlan_provider_event.c index 10ece5a47522..01a9d7c993ee 100644 --- a/net/irda/irlan/irlan_provider_event.c +++ b/net/irda/irlan/irlan_provider_event.c | |||
@@ -72,7 +72,7 @@ void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event, | |||
72 | static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event, | 72 | static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event, |
73 | struct sk_buff *skb) | 73 | struct sk_buff *skb) |
74 | { | 74 | { |
75 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 75 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
76 | 76 | ||
77 | IRDA_ASSERT(self != NULL, return -1;); | 77 | IRDA_ASSERT(self != NULL, return -1;); |
78 | 78 | ||
@@ -82,7 +82,7 @@ static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event, | |||
82 | irlan_next_provider_state( self, IRLAN_INFO); | 82 | irlan_next_provider_state( self, IRLAN_INFO); |
83 | break; | 83 | break; |
84 | default: | 84 | default: |
85 | IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__ , event); | 85 | IRDA_DEBUG(4, "%s(), Unknown event %d\n", __func__ , event); |
86 | break; | 86 | break; |
87 | } | 87 | } |
88 | if (skb) | 88 | if (skb) |
@@ -101,7 +101,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event, | |||
101 | { | 101 | { |
102 | int ret; | 102 | int ret; |
103 | 103 | ||
104 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 104 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
105 | 105 | ||
106 | IRDA_ASSERT(self != NULL, return -1;); | 106 | IRDA_ASSERT(self != NULL, return -1;); |
107 | 107 | ||
@@ -147,7 +147,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event, | |||
147 | irlan_next_provider_state(self, IRLAN_IDLE); | 147 | irlan_next_provider_state(self, IRLAN_IDLE); |
148 | break; | 148 | break; |
149 | default: | 149 | default: |
150 | IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __FUNCTION__ , event); | 150 | IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event); |
151 | break; | 151 | break; |
152 | } | 152 | } |
153 | if (skb) | 153 | if (skb) |
@@ -166,7 +166,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event, | |||
166 | static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event, | 166 | static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event, |
167 | struct sk_buff *skb) | 167 | struct sk_buff *skb) |
168 | { | 168 | { |
169 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 169 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
170 | 170 | ||
171 | IRDA_ASSERT(self != NULL, return -1;); | 171 | IRDA_ASSERT(self != NULL, return -1;); |
172 | 172 | ||
@@ -186,7 +186,7 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event, | |||
186 | irlan_next_provider_state(self, IRLAN_IDLE); | 186 | irlan_next_provider_state(self, IRLAN_IDLE); |
187 | break; | 187 | break; |
188 | default: | 188 | default: |
189 | IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event); | 189 | IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event); |
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | if (skb) | 192 | if (skb) |
@@ -205,7 +205,7 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event, | |||
205 | static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event, | 205 | static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event, |
206 | struct sk_buff *skb) | 206 | struct sk_buff *skb) |
207 | { | 207 | { |
208 | IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); | 208 | IRDA_DEBUG(4, "%s()\n", __func__ ); |
209 | 209 | ||
210 | IRDA_ASSERT(self != NULL, return -1;); | 210 | IRDA_ASSERT(self != NULL, return -1;); |
211 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); | 211 | IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); |
@@ -221,7 +221,7 @@ static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event, | |||
221 | irlan_next_provider_state(self, IRLAN_IDLE); | 221 | irlan_next_provider_state(self, IRLAN_IDLE); |
222 | break; | 222 | break; |
223 | default: | 223 | default: |
224 | IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __FUNCTION__ , event); | 224 | IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event); |
225 | break; | 225 | break; |
226 | } | 226 | } |
227 | if (skb) | 227 | if (skb) |