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

Commit 6c7e3469 authored by Chen Gang's avatar Chen Gang Committed by Mauro Carvalho Chehab
Browse files

[media] drivers: media: usb: b2c2: use usb_*_coherent() instead of... 


[media] drivers: media: usb: b2c2: use usb_*_coherent() instead of pci_*_consistent() in flexcop-usb.c

Some architectures do not support PCI, but still support USB, so need
let our usb driver try to use usb_* instead of pci_* to support these
architectures, or can not pass compiling.
The related error (with allmodconfig for arc):
    CC [M]  drivers/media/usb/b2c2/flexcop-usb.o
  drivers/media/usb/b2c2/flexcop-usb.c: In function ‘flexcop_usb_transfer_exit’:
  drivers/media/usb/b2c2/flexcop-usb.c:393: error: implicit declaration of function ‘pci_free_consistent’
  drivers/media/usb/b2c2/flexcop-usb.c: In function ‘flexcop_usb_transfer_init’:
  drivers/media/usb/b2c2/flexcop-usb.c:410: error: implicit declaration of function ‘pci_alloc_consistent’

Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b5eee196

drivers/media/usb/b2c2/flexcop-usb.c

+3 −3
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void flexcop_usb_transfer_exit(struct flexcop_usb *fc_usb) 
		}



	if (fc_usb->iso_buffer != NULL)

		pci_free_consistent(NULL,

		usb_free_coherent(fc_usb->udev,

			fc_usb->buffer_size, fc_usb->iso_buffer,

			fc_usb->dma_addr);

}
@@ -407,8 +407,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb) 
			"each of %d bytes size = %d.\n", B2C2_USB_NUM_ISO_URB,

			B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize);



	fc_usb->iso_buffer = pci_alloc_consistent(NULL,

			bufsize, &fc_usb->dma_addr);

	fc_usb->iso_buffer = usb_alloc_coherent(fc_usb->udev,

			bufsize, GFP_KERNEL, &fc_usb->dma_addr);

	if (fc_usb->iso_buffer == NULL)

		return -ENOMEM;