kfifo: cleanup namespace

change name of __kfifo_* functions to kfifo_*, because the prefix __kfifo
should be reserved for internal functions only.

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>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index a76da201183b..96aa787f208f 100644
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -505,19 +505,19 @@ static inline void cq_delete(struct kfifo *kfifo)
 
 static inline unsigned int cq_howmany(struct kfifo *kfifo)
 {
-        return __kfifo_len(kfifo) / sizeof(void *);
+        return kfifo_len(kfifo) / sizeof(void *);
 }
 
 static inline int cq_put(struct kfifo *kfifo, void *p)
 {
-        return __kfifo_put(kfifo, (void *)&p, sizeof(p));
+        return kfifo_put(kfifo, (void *)&p, sizeof(p));
 }
 
 static inline void *cq_get(struct kfifo *kfifo)
 {
         void *p = NULL;
 
-        __kfifo_get(kfifo, (void *)&p, sizeof(p));
+        kfifo_get(kfifo, (void *)&p, sizeof(p));
         return p;
 }
 
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 61eef18218be..d0a2e464cacd 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -276,7 +276,7 @@ static int usb_serial_generic_write_start(struct usb_serial_port *port)
         if (port->write_urb_busy)
                 start_io = false;
         else {
-                start_io = (__kfifo_len(port->write_fifo) != 0);
+                start_io = (kfifo_len(port->write_fifo) != 0);
                 port->write_urb_busy = start_io;
         }
         spin_unlock_irqrestore(&port->lock, flags);
@@ -370,7 +370,7 @@ int usb_serial_generic_write_room(struct tty_struct *tty)
                                 (serial->type->max_in_flight_urbs -
                                  port->urbs_in_flight);
         } else if (serial->num_bulk_out)
-                room = port->write_fifo->size - __kfifo_len(port->write_fifo);
+                room = port->write_fifo->size - kfifo_len(port->write_fifo);
         spin_unlock_irqrestore(&port->lock, flags);
 
         dbg("%s - returns %d", __func__, room);