diff options
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index f807479ef65b..26d8a5f36896 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -387,7 +387,7 @@ extern void usb_put_dev(struct usb_device *dev); | |||
| 387 | #define usb_unlock_device(udev) up(&(udev)->dev.sem) | 387 | #define usb_unlock_device(udev) up(&(udev)->dev.sem) |
| 388 | #define usb_trylock_device(udev) down_trylock(&(udev)->dev.sem) | 388 | #define usb_trylock_device(udev) down_trylock(&(udev)->dev.sem) |
| 389 | extern int usb_lock_device_for_reset(struct usb_device *udev, | 389 | extern int usb_lock_device_for_reset(struct usb_device *udev, |
| 390 | struct usb_interface *iface); | 390 | const struct usb_interface *iface); |
| 391 | 391 | ||
| 392 | /* USB port reset for device reinitialization */ | 392 | /* USB port reset for device reinitialization */ |
| 393 | extern int usb_reset_device(struct usb_device *dev); | 393 | extern int usb_reset_device(struct usb_device *dev); |
| @@ -426,10 +426,10 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface, | |||
| 426 | 426 | ||
| 427 | extern struct usb_interface *usb_find_interface(struct usb_driver *drv, | 427 | extern struct usb_interface *usb_find_interface(struct usb_driver *drv, |
| 428 | int minor); | 428 | int minor); |
| 429 | extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, | 429 | extern struct usb_interface *usb_ifnum_to_if(const struct usb_device *dev, |
| 430 | unsigned ifnum); | 430 | unsigned ifnum); |
| 431 | extern struct usb_host_interface *usb_altnum_to_altsetting( | 431 | extern struct usb_host_interface *usb_altnum_to_altsetting( |
| 432 | struct usb_interface *intf, unsigned int altnum); | 432 | const struct usb_interface *intf, unsigned int altnum); |
| 433 | 433 | ||
| 434 | 434 | ||
| 435 | /** | 435 | /** |
| @@ -1064,14 +1064,14 @@ void usb_buffer_unmap (struct urb *urb); | |||
| 1064 | #endif | 1064 | #endif |
| 1065 | 1065 | ||
| 1066 | struct scatterlist; | 1066 | struct scatterlist; |
| 1067 | int usb_buffer_map_sg (struct usb_device *dev, unsigned pipe, | 1067 | int usb_buffer_map_sg(const struct usb_device *dev, unsigned pipe, |
| 1068 | struct scatterlist *sg, int nents); | 1068 | struct scatterlist *sg, int nents); |
| 1069 | #if 0 | 1069 | #if 0 |
| 1070 | void usb_buffer_dmasync_sg (struct usb_device *dev, unsigned pipe, | 1070 | void usb_buffer_dmasync_sg(const struct usb_device *dev, unsigned pipe, |
| 1071 | struct scatterlist *sg, int n_hw_ents); | 1071 | struct scatterlist *sg, int n_hw_ents); |
| 1072 | #endif | 1072 | #endif |
| 1073 | void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe, | 1073 | void usb_buffer_unmap_sg(const struct usb_device *dev, unsigned pipe, |
| 1074 | struct scatterlist *sg, int n_hw_ents); | 1074 | struct scatterlist *sg, int n_hw_ents); |
| 1075 | 1075 | ||
| 1076 | /*-------------------------------------------------------------------* | 1076 | /*-------------------------------------------------------------------* |
| 1077 | * SYNCHRONOUS CALL SUPPORT * | 1077 | * SYNCHRONOUS CALL SUPPORT * |
