openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] em28xx: rename struct em28xx_usb_isoc_bufs to em28xx_usb_bufs 

It will be used for USB bulk transfers, too.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Frank Schaefer 2012-11-08 14:11:36 -03:00 committed by Mauro Carvalho Chehab
parent 515688a898
commit f0fa9936f5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/usb/em28xx/em28xx-core.c
View File

@ -964,7 +964,7 @@ static void em28xx_irq_callback(struct urb *urb)
void em28xx_uninit_isoc(struct em28xx *dev, enum em28xx_mode mode)
{
struct urb *urb;
struct em28xx_usb_isoc_bufs *isoc_bufs;
struct em28xx_usb_bufs *isoc_bufs;
int i;
em28xx_isocdbg("em28xx: called em28xx_uninit_isoc in mode %d\n", mode);
@ -1012,7 +1012,7 @@ void em28xx_stop_urbs(struct em28xx *dev)
{
int i;
struct urb *urb;
struct em28xx_usb_isoc_bufs *isoc_bufs = &dev->isoc_ctl.digital_bufs;
struct em28xx_usb_bufs *isoc_bufs = &dev->isoc_ctl.digital_bufs;
em28xx_isocdbg("em28xx: called em28xx_stop_urbs\n");
@ -1036,7 +1036,7 @@ EXPORT_SYMBOL_GPL(em28xx_stop_urbs);
int em28xx_alloc_isoc(struct em28xx *dev, enum em28xx_mode mode,
int num_packets, int num_bufs, int max_pkt_size)
{
struct em28xx_usb_isoc_bufs *isoc_bufs;
struct em28xx_usb_bufs *isoc_bufs;
int i;
int sb_size, pipe;
struct urb *urb;
@ -1134,7 +1134,7 @@ int em28xx_init_isoc(struct em28xx *dev, enum em28xx_mode mode,
{
struct em28xx_dmaqueue *dma_q = &dev->vidq;
struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
struct em28xx_usb_isoc_bufs *isoc_bufs;
struct em28xx_usb_bufs *isoc_bufs;
int i;
int rc;
int alloc;

10
drivers/media/usb/em28xx/em28xx.h
View File

@ -203,7 +203,7 @@ enum em28xx_mode {
struct em28xx;
struct em28xx_usb_isoc_bufs {
struct em28xx_usb_bufs {
/* max packet size of isoc transaction */
int max_pkt_size;
@ -213,19 +213,19 @@ struct em28xx_usb_isoc_bufs {
/* number of allocated urbs */
int num_bufs;
/* urb for isoc transfers */
/* urb for isoc/bulk transfers */
struct urb **urb;
/* transfer buffers for isoc transfer */
/* transfer buffers for isoc/bulk transfer */
char **transfer_buffer;
};
struct em28xx_usb_isoc_ctl {
/* isoc transfer buffers for analog mode */
struct em28xx_usb_isoc_bufs analog_bufs;
struct em28xx_usb_bufs analog_bufs;
/* isoc transfer buffers for digital mode */
struct em28xx_usb_isoc_bufs digital_bufs;
struct em28xx_usb_bufs digital_bufs;
/* Stores already requested buffers */
struct em28xx_buffer *vid_buf;