Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 997ea58e authored by Daniel Mack's avatar Daniel Mack Committed by Greg Kroah-Hartman
Browse files

USB: rename usb_buffer_alloc() and usb_buffer_free() users 



For more clearance what the functions actually do,

  usb_buffer_alloc() is renamed to usb_alloc_coherent()
  usb_buffer_free()  is renamed to usb_free_coherent()

They should only be used in code which really needs DMA coherency.

All call sites have been changed accordingly, except for staging
drivers.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Pedro Ribeiro <pedrib@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 48679c6d

Documentation/DocBook/writing_usb_driver.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static inline void skel_delete (struct usb_skel *dev) 
{

    kfree (dev->bulk_in_buffer);

    if (dev->bulk_out_buffer != NULL)

        usb_buffer_free (dev->udev, dev->bulk_out_size,

        usb_free_coherent (dev->udev, dev->bulk_out_size,

            dev->bulk_out_buffer,

            dev->write_urb->transfer_dma);

    usb_free_urb (dev->write_urb);

Documentation/usb/dma.txt

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ and effects like cache-trashing can impose subtle penalties. 
  kind of addresses to store in urb->transfer_buffer and urb->transfer_dma.

  You'd also set URB_NO_TRANSFER_DMA_MAP in urb->transfer_flags:



	void *usb_buffer_alloc (struct usb_device *dev, size_t size,

	void *usb_alloc_coherent (struct usb_device *dev, size_t size,

		int mem_flags, dma_addr_t *dma);



	void usb_buffer_free (struct usb_device *dev, size_t size,

	void usb_free_coherent (struct usb_device *dev, size_t size,

		void *addr, dma_addr_t dma);



  Most drivers should *NOT* be using these primitives; they don't need

drivers/hid/usbhid/hid-core.c

+6 −6
Original line number Diff line number Diff line
@@ -783,12 +783,12 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid) 
{

	struct usbhid_device *usbhid = hid->driver_data;



	usbhid->inbuf = usb_buffer_alloc(dev, usbhid->bufsize, GFP_KERNEL,

	usbhid->inbuf = usb_alloc_coherent(dev, usbhid->bufsize, GFP_KERNEL,

			&usbhid->inbuf_dma);

	usbhid->outbuf = usb_buffer_alloc(dev, usbhid->bufsize, GFP_KERNEL,

	usbhid->outbuf = usb_alloc_coherent(dev, usbhid->bufsize, GFP_KERNEL,

			&usbhid->outbuf_dma);

	usbhid->cr = kmalloc(sizeof(*usbhid->cr), GFP_KERNEL);

	usbhid->ctrlbuf = usb_buffer_alloc(dev, usbhid->bufsize, GFP_KERNEL,

	usbhid->ctrlbuf = usb_alloc_coherent(dev, usbhid->bufsize, GFP_KERNEL,

			&usbhid->ctrlbuf_dma);

	if (!usbhid->inbuf || !usbhid->outbuf || !usbhid->cr ||

			!usbhid->ctrlbuf)
@@ -843,10 +843,10 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid) 
{

	struct usbhid_device *usbhid = hid->driver_data;



	usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);

	usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);

	usb_free_coherent(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);

	usb_free_coherent(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);

	kfree(usbhid->cr);

	usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);

	usb_free_coherent(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);

}



static int usbhid_parse(struct hid_device *hid)

drivers/hid/usbhid/usbkbd.c

+4 −4
Original line number Diff line number Diff line
@@ -196,11 +196,11 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd) 
		return -1;

	if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL)))

		return -1;

	if (!(kbd->new = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &kbd->new_dma)))

	if (!(kbd->new = usb_alloc_coherent(dev, 8, GFP_ATOMIC, &kbd->new_dma)))

		return -1;

	if (!(kbd->cr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL)))

		return -1;

	if (!(kbd->leds = usb_buffer_alloc(dev, 1, GFP_ATOMIC, &kbd->leds_dma)))

	if (!(kbd->leds = usb_alloc_coherent(dev, 1, GFP_ATOMIC, &kbd->leds_dma)))

		return -1;



	return 0;
@@ -210,9 +210,9 @@ static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd) 
{

	usb_free_urb(kbd->irq);

	usb_free_urb(kbd->led);

	usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);

	usb_free_coherent(dev, 8, kbd->new, kbd->new_dma);

	kfree(kbd->cr);

	usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);

	usb_free_coherent(dev, 1, kbd->leds, kbd->leds_dma);

}



static int usb_kbd_probe(struct usb_interface *iface,

drivers/hid/usbhid/usbmouse.c

+3 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i 
	if (!mouse || !input_dev)

		goto fail1;



	mouse->data = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &mouse->data_dma);

	mouse->data = usb_alloc_coherent(dev, 8, GFP_ATOMIC, &mouse->data_dma);

	if (!mouse->data)

		goto fail1;
@@ -205,7 +205,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i 
fail3:	

	usb_free_urb(mouse->irq);

fail2:	

	usb_buffer_free(dev, 8, mouse->data, mouse->data_dma);

	usb_free_coherent(dev, 8, mouse->data, mouse->data_dma);

fail1:	

	input_free_device(input_dev);

	kfree(mouse);
@@ -221,7 +221,7 @@ static void usb_mouse_disconnect(struct usb_interface *intf) 
		usb_kill_urb(mouse->irq);

		input_unregister_device(mouse->dev);

		usb_free_urb(mouse->irq);

		usb_buffer_free(interface_to_usbdev(intf), 8, mouse->data, mouse->data_dma);

		usb_free_coherent(interface_to_usbdev(intf), 8, mouse->data, mouse->data_dma);

		kfree(mouse);

	}

}