net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
此提交包含在:
@@ -124,7 +124,7 @@ static int __init irlan_init(void)
|
||||
struct irlan_cb *new;
|
||||
__u16 hints;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
{ struct proc_dir_entry *proc;
|
||||
@@ -136,7 +136,7 @@ static int __init irlan_init(void)
|
||||
}
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
hints = irlmp_service_to_hint(S_LAN);
|
||||
|
||||
/* Register with IrLMP as a client */
|
||||
@@ -179,7 +179,7 @@ static void __exit irlan_cleanup(void)
|
||||
{
|
||||
struct irlan_cb *self, *next;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
irlmp_unregister_client(ckey);
|
||||
irlmp_unregister_service(skey);
|
||||
@@ -207,7 +207,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
|
||||
struct net_device *dev;
|
||||
struct irlan_cb *self;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
/* Create network device with irlan */
|
||||
dev = alloc_irlandev(eth ? "eth%d" : "irlan%d");
|
||||
@@ -252,7 +252,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
|
||||
|
||||
if (register_netdev(dev)) {
|
||||
IRDA_DEBUG(2, "%s(), register_netdev() failed!\n",
|
||||
__FUNCTION__ );
|
||||
__func__ );
|
||||
self = NULL;
|
||||
free_netdev(dev);
|
||||
} else {
|
||||
@@ -272,7 +272,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
|
||||
*/
|
||||
static void __irlan_close(struct irlan_cb *self)
|
||||
{
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
ASSERT_RTNL();
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
@@ -320,7 +320,7 @@ static void irlan_connect_indication(void *instance, void *sap,
|
||||
struct irlan_cb *self;
|
||||
struct tsap_cb *tsap;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
self = (struct irlan_cb *) instance;
|
||||
tsap = (struct tsap_cb *) sap;
|
||||
@@ -332,7 +332,7 @@ static void irlan_connect_indication(void *instance, void *sap,
|
||||
self->max_sdu_size = max_sdu_size;
|
||||
self->max_header_size = max_header_size;
|
||||
|
||||
IRDA_DEBUG(0, "%s: We are now connected!\n", __FUNCTION__);
|
||||
IRDA_DEBUG(0, "%s: We are now connected!\n", __func__);
|
||||
|
||||
del_timer(&self->watchdog_timer);
|
||||
|
||||
@@ -376,7 +376,7 @@ static void irlan_connect_confirm(void *instance, void *sap,
|
||||
|
||||
/* TODO: we could set the MTU depending on the max_sdu_size */
|
||||
|
||||
IRDA_DEBUG(0, "%s: We are now connected!\n", __FUNCTION__);
|
||||
IRDA_DEBUG(0, "%s: We are now connected!\n", __func__);
|
||||
del_timer(&self->watchdog_timer);
|
||||
|
||||
/*
|
||||
@@ -412,7 +412,7 @@ static void irlan_disconnect_indication(void *instance,
|
||||
struct irlan_cb *self;
|
||||
struct tsap_cb *tsap;
|
||||
|
||||
IRDA_DEBUG(0, "%s(), reason=%d\n", __FUNCTION__ , reason);
|
||||
IRDA_DEBUG(0, "%s(), reason=%d\n", __func__ , reason);
|
||||
|
||||
self = (struct irlan_cb *) instance;
|
||||
tsap = (struct tsap_cb *) sap;
|
||||
@@ -431,22 +431,22 @@ static void irlan_disconnect_indication(void *instance,
|
||||
|
||||
switch (reason) {
|
||||
case LM_USER_REQUEST: /* User request */
|
||||
IRDA_DEBUG(2, "%s(), User requested\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), User requested\n", __func__ );
|
||||
break;
|
||||
case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */
|
||||
IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __func__ );
|
||||
break;
|
||||
case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */
|
||||
IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __func__ );
|
||||
break;
|
||||
case LM_LAP_RESET: /* IrLAP reset */
|
||||
IRDA_DEBUG(2, "%s(), IrLAP reset\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), IrLAP reset\n", __func__ );
|
||||
break;
|
||||
case LM_INIT_DISCONNECT:
|
||||
IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __func__ );
|
||||
break;
|
||||
default:
|
||||
IRDA_ERROR("%s(), Unknown disconnect reason\n", __FUNCTION__);
|
||||
IRDA_ERROR("%s(), Unknown disconnect reason\n", __func__);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -468,7 +468,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
|
||||
struct tsap_cb *tsap;
|
||||
notify_t notify;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -490,7 +490,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
|
||||
|
||||
tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, ¬ify);
|
||||
if (!tsap) {
|
||||
IRDA_DEBUG(2, "%s(), Got no tsap!\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ );
|
||||
return;
|
||||
}
|
||||
self->tsap_data = tsap;
|
||||
@@ -504,7 +504,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
|
||||
|
||||
void irlan_close_tsaps(struct irlan_cb *self)
|
||||
{
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -594,7 +594,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
if (irda_lock(&self->client.tx_busy) == FALSE)
|
||||
return -EBUSY;
|
||||
@@ -613,7 +613,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
|
||||
dev_kfree_skb(skb);
|
||||
return -1;
|
||||
}
|
||||
IRDA_DEBUG(2, "%s(), sending ...\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), sending ...\n", __func__ );
|
||||
|
||||
return irttp_data_request(self->client.tsap_ctrl, skb);
|
||||
}
|
||||
@@ -626,7 +626,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
|
||||
*/
|
||||
static void irlan_ctrl_data_request(struct irlan_cb *self, struct sk_buff *skb)
|
||||
{
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
/* Queue command */
|
||||
skb_queue_tail(&self->client.txq, skb);
|
||||
@@ -646,7 +646,7 @@ void irlan_get_provider_info(struct irlan_cb *self)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -679,7 +679,7 @@ void irlan_open_data_channel(struct irlan_cb *self)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -714,7 +714,7 @@ void irlan_close_data_channel(struct irlan_cb *self)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -755,7 +755,7 @@ static void irlan_open_unicast_addr(struct irlan_cb *self)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -797,7 +797,7 @@ void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -841,7 +841,7 @@ void irlan_set_multicast_filter(struct irlan_cb *self, int status)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -886,7 +886,7 @@ static void irlan_get_unicast_addr(struct irlan_cb *self)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -926,7 +926,7 @@ void irlan_get_media_char(struct irlan_cb *self)
|
||||
struct sk_buff *skb;
|
||||
__u8 *frame;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
IRDA_ASSERT(self != NULL, return;);
|
||||
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
|
||||
@@ -1014,7 +1014,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
|
||||
int n=0;
|
||||
|
||||
if (skb == NULL) {
|
||||
IRDA_DEBUG(2, "%s(), Got NULL skb\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), Got NULL skb\n", __func__ );
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1031,7 +1031,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
|
||||
IRDA_ASSERT(value_len > 0, return 0;);
|
||||
break;
|
||||
default:
|
||||
IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __func__ );
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
@@ -1041,7 +1041,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
|
||||
|
||||
/* Make space for data */
|
||||
if (skb_tailroom(skb) < (param_len+value_len+3)) {
|
||||
IRDA_DEBUG(2, "%s(), No more space at end of skb\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), No more space at end of skb\n", __func__ );
|
||||
return 0;
|
||||
}
|
||||
skb_put(skb, param_len+value_len+3);
|
||||
@@ -1088,13 +1088,13 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
|
||||
__u16 val_len;
|
||||
int n=0;
|
||||
|
||||
IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(4, "%s()\n", __func__ );
|
||||
|
||||
/* get length of parameter name (1 byte) */
|
||||
name_len = buf[n++];
|
||||
|
||||
if (name_len > 254) {
|
||||
IRDA_DEBUG(2, "%s(), name_len > 254\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), name_len > 254\n", __func__ );
|
||||
return -RSP_INVALID_COMMAND_FORMAT;
|
||||
}
|
||||
|
||||
@@ -1111,7 +1111,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
|
||||
le16_to_cpus(&val_len); n+=2;
|
||||
|
||||
if (val_len > 1016) {
|
||||
IRDA_DEBUG(2, "%s(), parameter length to long\n", __FUNCTION__ );
|
||||
IRDA_DEBUG(2, "%s(), parameter length to long\n", __func__ );
|
||||
return -RSP_INVALID_COMMAND_FORMAT;
|
||||
}
|
||||
*len = val_len;
|
||||
|
新增問題並參考
封鎖使用者