mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
kfifo: move out spinlock
Move the pointer to the spinlock out of struct kfifo. Most users in
tree do not actually use a spinlock, so the few exceptions now have to
call kfifo_{get,put}_locked, which takes an extra argument to a
spinlock.
Signed-off-by: Stefani Seibold <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Acked-by: Mauro Carvalho Chehab <[email protected]>
Acked-by: Andi Kleen <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
4546548789
commit
c1e13f2567
16 changed files with 131 additions and 130 deletions
|
|
@ -495,7 +495,7 @@ static inline struct usb_hcd *fhci_to_hcd(struct fhci_hcd *fhci)
|
|||
/* fifo of pointers */
|
||||
static inline int cq_new(struct kfifo *fifo, int size)
|
||||
{
|
||||
return kfifo_alloc(fifo, size * sizeof(void *), GFP_KERNEL, NULL);
|
||||
return kfifo_alloc(fifo, size * sizeof(void *), GFP_KERNEL);
|
||||
}
|
||||
|
||||
static inline void cq_delete(struct kfifo *kfifo)
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ static int usb_serial_generic_write_start(struct usb_serial_port *port)
|
|||
return 0;
|
||||
|
||||
data = port->write_urb->transfer_buffer;
|
||||
count = kfifo_get(port->write_fifo, data, port->bulk_out_size);
|
||||
count = kfifo_get_locked(port->write_fifo, data, port->bulk_out_size, &port->lock);
|
||||
usb_serial_debug_data(debug, &port->dev, __func__, count, data);
|
||||
|
||||
/* set up our urb */
|
||||
|
|
@ -345,7 +345,7 @@ int usb_serial_generic_write(struct tty_struct *tty,
|
|||
return usb_serial_multi_urb_write(tty, port,
|
||||
buf, count);
|
||||
|
||||
count = kfifo_put(port->write_fifo, buf, count);
|
||||
count = kfifo_put_locked(port->write_fifo, buf, count, &port->lock);
|
||||
result = usb_serial_generic_write_start(port);
|
||||
|
||||
if (result >= 0)
|
||||
|
|
|
|||
|
|
@ -939,8 +939,7 @@ int usb_serial_probe(struct usb_interface *interface,
|
|||
dev_err(&interface->dev, "No free urbs available\n");
|
||||
goto probe_error;
|
||||
}
|
||||
if (kfifo_alloc(&port->write_fifo, PAGE_SIZE, GFP_KERNEL,
|
||||
&port->lock))
|
||||
if (kfifo_alloc(port->write_fifo, PAGE_SIZE, GFP_KERNEL))
|
||||
goto probe_error;
|
||||
buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
|
||||
port->bulk_out_size = buffer_size;
|
||||
|
|
|
|||
Loading…
Reference in a new issue