aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/irlap.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/irlap.c')
-rw-r--r--net/irda/irlap.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/irda/irlap.c b/net/irda/irlap.c
index e7852a07495e..fd73e4af715a 100644
--- a/net/irda/irlap.c
+++ b/net/irda/irlap.c
@@ -87,7 +87,7 @@ int __init irlap_init(void)
87 /* Allocate master array */ 87 /* Allocate master array */
88 irlap = hashbin_new(HB_LOCK); 88 irlap = hashbin_new(HB_LOCK);
89 if (irlap == NULL) { 89 if (irlap == NULL) {
90 IRDA_ERROR("%s: can't allocate irlap hashbin!\n", 90 IRDA_ERROR("%s: can't allocate irlap hashbin!\n",
91 __FUNCTION__); 91 __FUNCTION__);
92 return -ENOMEM; 92 return -ENOMEM;
93 } 93 }
@@ -701,8 +701,8 @@ void irlap_update_nr_received(struct irlap_cb *self, int nr)
701 int count = 0; 701 int count = 0;
702 702
703 /* 703 /*
704 * Remove all the ack-ed frames from the window queue. 704 * Remove all the ack-ed frames from the window queue.
705 */ 705 */
706 706
707 /* 707 /*
708 * Optimize for the common case. It is most likely that the receiver 708 * Optimize for the common case. It is most likely that the receiver
@@ -1109,13 +1109,13 @@ static void *irlap_seq_start(struct seq_file *seq, loff_t *pos)
1109 spin_lock_irq(&irlap->hb_spinlock); 1109 spin_lock_irq(&irlap->hb_spinlock);
1110 iter->id = 0; 1110 iter->id = 0;
1111 1111
1112 for (self = (struct irlap_cb *) hashbin_get_first(irlap); 1112 for (self = (struct irlap_cb *) hashbin_get_first(irlap);
1113 self; self = (struct irlap_cb *) hashbin_get_next(irlap)) { 1113 self; self = (struct irlap_cb *) hashbin_get_next(irlap)) {
1114 if (iter->id == *pos) 1114 if (iter->id == *pos)
1115 break; 1115 break;
1116 ++iter->id; 1116 ++iter->id;
1117 } 1117 }
1118 1118
1119 return self; 1119 return self;
1120} 1120}
1121 1121
@@ -1137,7 +1137,7 @@ static int irlap_seq_show(struct seq_file *seq, void *v)
1137{ 1137{
1138 const struct irlap_iter_state *iter = seq->private; 1138 const struct irlap_iter_state *iter = seq->private;
1139 const struct irlap_cb *self = v; 1139 const struct irlap_cb *self = v;
1140 1140
1141 IRDA_ASSERT(self->magic == LAP_MAGIC, return -EINVAL;); 1141 IRDA_ASSERT(self->magic == LAP_MAGIC, return -EINVAL;);
1142 1142
1143 seq_printf(seq, "irlap%d ", iter->id); 1143 seq_printf(seq, "irlap%d ", iter->id);
@@ -1222,7 +1222,7 @@ static int irlap_seq_open(struct inode *inode, struct file *file)
1222 struct seq_file *seq; 1222 struct seq_file *seq;
1223 int rc = -ENOMEM; 1223 int rc = -ENOMEM;
1224 struct irlap_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL); 1224 struct irlap_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
1225 1225
1226 if (!s) 1226 if (!s)
1227 goto out; 1227 goto out;
1228 1228