aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsrp.c
diff options
context:
space:
mode:
authorStefani Seibold <stefani@seibold.net>2009-12-21 17:37:28 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-22 17:17:56 -0500
commit7acd72eb85f1c7a15e8b5eb554994949241737f1 (patch)
tree76712bb9f38690d8cf9c2f91bef811e4413d1aa3 /drivers/scsi/libsrp.c
parente64c026dd09b73faf20707711402fc5ed55a8e70 (diff)
kfifo: rename kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...
rename kfifo_put... into kfifo_in... to prevent miss use of old non in kernel-tree drivers ditto for kfifo_get... -> kfifo_out... Improve the prototypes of kfifo_in and kfifo_out to make the kerneldoc annotations more readable. Add mini "howto porting to the new API" in kfifo.h Signed-off-by: Stefani Seibold <stefani@seibold.net> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Andi Kleen <ak@linux.intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/libsrp.c')
-rw-r--r--drivers/scsi/libsrp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 975e448cfcb9..8424b8606efb 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -61,7 +61,7 @@ static int srp_iu_pool_alloc(struct srp_queue *q, size_t max,
61 kfifo_init(&q->queue, (void *) q->pool, max * sizeof(void *)); 61 kfifo_init(&q->queue, (void *) q->pool, max * sizeof(void *));
62 62
63 for (i = 0, iue = q->items; i < max; i++) { 63 for (i = 0, iue = q->items; i < max; i++) {
64 kfifo_put(&q->queue, (void *) &iue, sizeof(void *)); 64 kfifo_in(&q->queue, (void *) &iue, sizeof(void *));
65 iue->sbuf = ring[i]; 65 iue->sbuf = ring[i];
66 iue++; 66 iue++;
67 } 67 }
@@ -163,7 +163,7 @@ struct iu_entry *srp_iu_get(struct srp_target *target)
163{ 163{
164 struct iu_entry *iue = NULL; 164 struct iu_entry *iue = NULL;
165 165
166 kfifo_get_locked(&target->iu_queue.queue, (void *) &iue, 166 kfifo_out_locked(&target->iu_queue.queue, (void *) &iue,
167 sizeof(void *), &target->iu_queue.lock); 167 sizeof(void *), &target->iu_queue.lock);
168 if (!iue) 168 if (!iue)
169 return iue; 169 return iue;
@@ -176,7 +176,7 @@ EXPORT_SYMBOL_GPL(srp_iu_get);
176 176
177void srp_iu_put(struct iu_entry *iue) 177void srp_iu_put(struct iu_entry *iue)
178{ 178{
179 kfifo_put_locked(&iue->target->iu_queue.queue, (void *) &iue, 179 kfifo_in_locked(&iue->target->iu_queue.queue, (void *) &iue,
180 sizeof(void *), &iue->target->iu_queue.lock); 180 sizeof(void *), &iue->target->iu_queue.lock);
181} 181}
182EXPORT_SYMBOL_GPL(srp_iu_put); 182EXPORT_SYMBOL_GPL(srp_iu_put);