X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Firda%2Fircomm%2Fircomm_core.c;h=ad6b6af3dd976c97bd75818f55e4361421923529;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=361e8de978066e337c3e607b452223bb5288fda2;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/net/irda/ircomm/ircomm_core.c b/net/irda/ircomm/ircomm_core.c index 361e8de97..ad6b6af3d 100644 --- a/net/irda/ircomm/ircomm_core.c +++ b/net/irda/ircomm/ircomm_core.c @@ -29,7 +29,6 @@ * ********************************************************************/ -#include #include #include #include @@ -62,17 +61,17 @@ static struct file_operations ircomm_proc_fops = { .open = ircomm_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = seq_release_private, + .release = seq_release, }; #endif /* CONFIG_PROC_FS */ hashbin_t *ircomm = NULL; -int __init ircomm_init(void) +static int __init ircomm_init(void) { ircomm = hashbin_new(HB_LOCK); if (ircomm == NULL) { - ERROR("%s(), can't allocate hashbin!\n", __FUNCTION__); + IRDA_ERROR("%s(), can't allocate hashbin!\n", __FUNCTION__); return -ENOMEM; } @@ -84,12 +83,12 @@ int __init ircomm_init(void) } #endif /* CONFIG_PROC_FS */ - MESSAGE("IrCOMM protocol (Dag Brattli)\n"); + IRDA_MESSAGE("IrCOMM protocol (Dag Brattli)\n"); return 0; } -void __exit ircomm_cleanup(void) +static void __exit ircomm_cleanup(void) { IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); @@ -114,14 +113,12 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line) IRDA_DEBUG(2, "%s(), service_type=0x%02x\n", __FUNCTION__ , service_type); - ASSERT(ircomm != NULL, return NULL;); + IRDA_ASSERT(ircomm != NULL, return NULL;); - self = kmalloc(sizeof(struct ircomm_cb), GFP_ATOMIC); + self = kzalloc(sizeof(struct ircomm_cb), GFP_ATOMIC); if (self == NULL) return NULL; - memset(self, 0, sizeof(struct ircomm_cb)); - self->notify = *notify; self->magic = IRCOMM_MAGIC; @@ -190,14 +187,14 @@ int ircomm_close(struct ircomm_cb *self) { struct ircomm_cb *entry; - ASSERT(self != NULL, return -EIO;); - ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;); + IRDA_ASSERT(self != NULL, return -EIO;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EIO;); IRDA_DEBUG(0, "%s()\n", __FUNCTION__ ); entry = hashbin_remove(ircomm, self->line, NULL); - ASSERT(entry == self, return -1;); + IRDA_ASSERT(entry == self, return -1;); return __ircomm_close(self); } @@ -220,8 +217,8 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel, IRDA_DEBUG(2 , "%s()\n", __FUNCTION__ ); - ASSERT(self != NULL, return -1;); - ASSERT(self->magic == IRCOMM_MAGIC, return -1;); + IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); self->service_type= service_type; @@ -277,8 +274,8 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata) { int ret; - ASSERT(self != NULL, return -1;); - ASSERT(self->magic == IRCOMM_MAGIC, return -1;); + IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); @@ -322,9 +319,9 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb) IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); - ASSERT(self != NULL, return -EFAULT;); - ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); - ASSERT(skb != NULL, return -EFAULT;); + IRDA_ASSERT(self != NULL, return -EFAULT;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); + IRDA_ASSERT(skb != NULL, return -EFAULT;); ret = ircomm_do_event(self, IRCOMM_DATA_REQUEST, skb, NULL); @@ -343,7 +340,7 @@ void ircomm_data_indication(struct ircomm_cb *self, struct sk_buff *skb) { IRDA_DEBUG(4, "%s()\n", __FUNCTION__ ); - ASSERT(skb->len > 0, return;); + IRDA_ASSERT(skb->len > 0, return;); if (self->notify.data_indication) self->notify.data_indication(self->notify.instance, self, skb); @@ -362,7 +359,7 @@ void ircomm_process_data(struct ircomm_cb *self, struct sk_buff *skb) { int clen; - ASSERT(skb->len > 0, return;); + IRDA_ASSERT(skb->len > 0, return;); clen = skb->data[0]; @@ -397,9 +394,9 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb) IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - ASSERT(self != NULL, return -EFAULT;); - ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); - ASSERT(skb != NULL, return -EFAULT;); + IRDA_ASSERT(self != NULL, return -EFAULT;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EFAULT;); + IRDA_ASSERT(skb != NULL, return -EFAULT;); ret = ircomm_do_event(self, IRCOMM_CONTROL_REQUEST, skb, NULL); @@ -455,8 +452,8 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata) IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - ASSERT(self != NULL, return -1;); - ASSERT(self->magic == IRCOMM_MAGIC, return -1;); + IRDA_ASSERT(self != NULL, return -1;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;); ret = ircomm_do_event(self, IRCOMM_DISCONNECT_REQUEST, userdata, &info); @@ -476,7 +473,7 @@ void ircomm_disconnect_indication(struct ircomm_cb *self, struct sk_buff *skb, { IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - ASSERT(info != NULL, return;); + IRDA_ASSERT(info != NULL, return;); if (self->notify.disconnect_indication) { self->notify.disconnect_indication(self->notify.instance, self, @@ -496,8 +493,8 @@ void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow) { IRDA_DEBUG(2, "%s()\n", __FUNCTION__ ); - ASSERT(self != NULL, return;); - ASSERT(self->magic == IRCOMM_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;); if (self->service_type == IRCOMM_3_WIRE_RAW) return; @@ -541,7 +538,7 @@ static int ircomm_seq_show(struct seq_file *seq, void *v) { const struct ircomm_cb *self = v; - ASSERT(self->magic == IRCOMM_MAGIC, return -EINVAL; ); + IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -EINVAL; ); if(self->line < 0x10) seq_printf(seq, "ircomm%d", self->line);