diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-28 07:24:41 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-28 07:24:41 +0100 |
commit | 5e0ddd07fa8fcbb84faac666d36ff9c37449a849 (patch) | |
tree | 29ff039af456f0aed5280943bc9e1593893b5b21 /sound/usb/line6/driver.h | |
parent | 1001fb810b1295d0600c0c6bdcb17889460470a5 (diff) | |
parent | 247d95ee6dd22e5323ecf7a73ff64110ef2fa2da (diff) | |
download | linux-5e0ddd07fa8fcbb84faac666d36ff9c37449a849.tar.bz2 |
Merge branch 'topic/line6' into for-next
Diffstat (limited to 'sound/usb/line6/driver.h')
-rw-r--r-- | sound/usb/line6/driver.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index efd58ac3215b..fce10f12f0d3 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -157,13 +157,11 @@ struct usb_line6 { int message_length; void (*process_message)(struct usb_line6 *); - void (*disconnect)(struct usb_interface *); + void (*disconnect)(struct usb_line6 *line6); }; extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, int size); -extern ssize_t line6_nop_read(struct device *dev, - struct device_attribute *attr, char *buf); extern int line6_read_data(struct usb_line6 *line6, int address, void *data, size_t datalen); extern int line6_read_serial_number(struct usb_line6 *line6, @@ -182,9 +180,11 @@ extern int line6_write_data(struct usb_line6 *line6, int address, void *data, size_t datalen); int line6_probe(struct usb_interface *interface, - struct usb_line6 *line6, + const struct usb_device_id *id, const struct line6_properties *properties, - int (*private_init)(struct usb_interface *, struct usb_line6 *)); + int (*private_init)(struct usb_line6 *, const struct usb_device_id *id), + size_t data_size); + void line6_disconnect(struct usb_interface *interface); #ifdef CONFIG_PM |