Skip to content

L
linux
Commit 58ff2208 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by David S. Miller
Browse files
Options

[PATCH] USB: fix up urb callback functions due to argument change

parent 4a7e8594
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
drivers/bluetooth/hci_usb.c
View file @ 58ff2208
...@@ -92,9 +92,9 @@ static struct usb_device_id ignore_ids[] = { ...@@ -92,9 +92,9 @@ static struct usb_device_id ignore_ids[] = {
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
static void hci_usb_interrupt(struct urb *urb); static void hci_usb_interrupt(struct urb *urb, struct pt_regs *regs);
static void hci_usb_rx_complete(struct urb *urb); static void hci_usb_rx_complete(struct urb *urb, struct pt_regs *regs);
static void hci_usb_tx_complete(struct urb *urb); static void hci_usb_tx_complete(struct urb *urb, struct pt_regs *regs);
static struct urb *hci_usb_get_completed(struct hci_usb *husb) static struct urb *hci_usb_get_completed(struct hci_usb *husb)
{ {
...@@ -429,7 +429,7 @@ int hci_usb_send_frame(struct sk_buff *skb) ...@@ -429,7 +429,7 @@ int hci_usb_send_frame(struct sk_buff *skb)
return 0; return 0;
} }
static void hci_usb_interrupt(struct urb *urb) static void hci_usb_interrupt(struct urb *urb, struct pt_regs *regs)
{ {
struct hci_usb *husb = (void *) urb->context; struct hci_usb *husb = (void *) urb->context;
struct hci_usb_scb *scb; struct hci_usb_scb *scb;
...@@ -531,7 +531,7 @@ static void hci_usb_interrupt(struct urb *urb) ...@@ -531,7 +531,7 @@ static void hci_usb_interrupt(struct urb *urb)
husb->hdev.name, status); husb->hdev.name, status);
} }
static void hci_usb_tx_complete(struct urb *urb) static void hci_usb_tx_complete(struct urb *urb, struct pt_regs *regs)
{ {
struct sk_buff *skb = (struct sk_buff *) urb->context; struct sk_buff *skb = (struct sk_buff *) urb->context;
struct hci_dev *hdev = (struct hci_dev *) skb->dev; struct hci_dev *hdev = (struct hci_dev *) skb->dev;
...@@ -563,7 +563,7 @@ static void hci_usb_tx_complete(struct urb *urb) ...@@ -563,7 +563,7 @@ static void hci_usb_tx_complete(struct urb *urb)
return; return;
} }
static void hci_usb_rx_complete(struct urb *urb) static void hci_usb_rx_complete(struct urb *urb, struct pt_regs *regs)
{ {
struct sk_buff *skb = (struct sk_buff *) urb->context; struct sk_buff *skb = (struct sk_buff *) urb->context;
struct hci_dev *hdev = (struct hci_dev *) skb->dev; struct hci_dev *hdev = (struct hci_dev *) skb->dev;
......
drivers/media/video/cpia_usb.c
View file @ 58ff2208
...@@ -107,7 +107,7 @@ static struct cpia_camera_ops cpia_usb_ops = { ...@@ -107,7 +107,7 @@ static struct cpia_camera_ops cpia_usb_ops = {
static struct cam_data *cam_list; static struct cam_data *cam_list;
static spinlock_t cam_list_lock_usb; static spinlock_t cam_list_lock_usb;
static void cpia_usb_complete(struct urb *urb) static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs)
{ {
int i; int i;
char *cdata; char *cdata;
......
drivers/usb/class/audio.c
View file @ 58ff2208
...@@ -890,7 +890,7 @@ static int usbin_retire_desc(struct usbin *u, struct urb *urb) ...@@ -890,7 +890,7 @@ static int usbin_retire_desc(struct usbin *u, struct urb *urb)
return err ? -1 : 0; return err ? -1 : 0;
} }
static void usbin_completed(struct urb *urb) static void usbin_completed(struct urb *urb, struct pt_regs *regs)
{ {
struct usb_audiodev *as = (struct usb_audiodev *)urb->context; struct usb_audiodev *as = (struct usb_audiodev *)urb->context;
struct usbin *u = &as->usbin; struct usbin *u = &as->usbin;
...@@ -956,7 +956,7 @@ static int usbin_sync_retire_desc(struct usbin *u, struct urb *urb) ...@@ -956,7 +956,7 @@ static int usbin_sync_retire_desc(struct usbin *u, struct urb *urb)
return 0; return 0;
} }
static void usbin_sync_completed(struct urb *urb) static void usbin_sync_completed(struct urb *urb, struct pt_regs *regs)
{ {
struct usb_audiodev *as = (struct usb_audiodev *)urb->context; struct usb_audiodev *as = (struct usb_audiodev *)urb->context;
struct usbin *u = &as->usbin; struct usbin *u = &as->usbin;
...@@ -1250,7 +1250,7 @@ static int usbout_retire_desc(struct usbout *u, struct urb *urb) ...@@ -1250,7 +1250,7 @@ static int usbout_retire_desc(struct usbout *u, struct urb *urb)
return 0; return 0;
} }
static void usbout_completed(struct urb *urb) static void usbout_completed(struct urb *urb, struct pt_regs *regs)
{ {
struct usb_audiodev *as = (struct usb_audiodev *)urb->context; struct usb_audiodev *as = (struct usb_audiodev *)urb->context;
struct usbout *u = &as->usbout; struct usbout *u = &as->usbout;
...@@ -1323,7 +1323,7 @@ static int usbout_sync_retire_desc(struct usbout *u, struct urb *urb) ...@@ -1323,7 +1323,7 @@ static int usbout_sync_retire_desc(struct usbout *u, struct urb *urb)
return 0; return 0;
} }
static void usbout_sync_completed(struct urb *urb) static void usbout_sync_completed(struct urb *urb, struct pt_regs *regs)
{ {
struct usb_audiodev *as = (struct usb_audiodev *)urb->context; struct usb_audiodev *as = (struct usb_audiodev *)urb->context;
struct usbout *u = &as->usbout; struct usbout *u = &as->usbout;
......
drivers/usb/media/dabusb.c
View file @ 58ff2208
...@@ -171,7 +171,7 @@ static int dabusb_free_buffers (pdabusb_t s) ...@@ -171,7 +171,7 @@ static int dabusb_free_buffers (pdabusb_t s)
return 0; return 0;
} }
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
static void dabusb_iso_complete (struct urb *purb) static void dabusb_iso_complete (struct urb *purb, struct pt_regs *regs)
{ {
pbuff_t b = purb->context; pbuff_t b = purb->context;
pdabusb_t s = b->s; pdabusb_t s = b->s;
......
drivers/usb/media/konicawc.c
View file @ 58ff2208
...@@ -332,7 +332,7 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb) ...@@ -332,7 +332,7 @@ static void resubmit_urb(struct uvd *uvd, struct urb *urb)
} }
static void konicawc_isoc_irq(struct urb *urb) static void konicawc_isoc_irq(struct urb *urb, struct pt_regs *regs)
{ {
struct uvd *uvd = urb->context; struct uvd *uvd = urb->context;
struct konicawc *cam = (struct konicawc *)uvd->user_data; struct konicawc *cam = (struct konicawc *)uvd->user_data;
......
drivers/usb/media/ov511.c
View file @ 58ff2208
...@@ -3843,7 +3843,7 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n) ...@@ -3843,7 +3843,7 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
} }
static void static void
ov51x_isoc_irq(struct urb *urb) ov51x_isoc_irq(struct urb *urb, struct pt_regs *regs)
{ {
int i; int i;
struct usb_ov511 *ov; struct usb_ov511 *ov;
......
drivers/usb/media/pwc-if.c
View file @ 58ff2208
...@@ -598,7 +598,7 @@ static int pwc_set_palette(struct pwc_device *pdev, int pal) ...@@ -598,7 +598,7 @@ static int pwc_set_palette(struct pwc_device *pdev, int pal)
/* This gets called for the Isochronous pipe (video). This is done in /* This gets called for the Isochronous pipe (video). This is done in
* interrupt time, so it has to be fast, not crash, and not stall. Neat. * interrupt time, so it has to be fast, not crash, and not stall. Neat.
*/ */
static void pwc_isoc_handler(struct urb *urb) static void pwc_isoc_handler(struct urb *urb, struct pt_regs *regs)
{ {
struct pwc_device *pdev; struct pwc_device *pdev;
int i, fst, flen; int i, fst, flen;
......
drivers/usb/media/usbvideo.c
View file @ 58ff2208
...@@ -1820,7 +1820,7 @@ static int usbvideo_CompressIsochronous(struct uvd *uvd, struct urb *urb) ...@@ -1820,7 +1820,7 @@ static int usbvideo_CompressIsochronous(struct uvd *uvd, struct urb *urb)
return totlen; return totlen;
} }
static void usbvideo_IsocIrq(struct urb *urb) static void usbvideo_IsocIrq(struct urb *urb, struct pt_regs *regs)
{ {
int i, ret, len; int i, ret, len;
struct uvd *uvd = urb->context; struct uvd *uvd = urb->context;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7