diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-14 20:37:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-14 20:37:50 +0200 |
| commit | 81522637485dd6ec9de4279c9714d58f884b6091 (patch) | |
| tree | 74657b5881c08b1e6a7042482e593897e678afe2 /include/linux/ulpi | |
| parent | usb: ohci: Allow ohci on omap5 also (diff) | |
| parent | usb: gadget: uvc: add V4L2 dependency (diff) | |
| download | linux-dev-81522637485dd6ec9de4279c9714d58f884b6091.tar.xz linux-dev-81522637485dd6ec9de4279c9714d58f884b6091.zip | |
Merge tag 'usb-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v4.9 merge window
This time around we have 92 non-merge commits. Most
of the changes are in drivers/usb/gadget (40.3%)
with drivers/usb/gadget/function being the most
active directory (27.2%).
As for UDC drivers, only dwc3 (26.5%) and dwc2
(12.7%) have really been active.
The most important changes for dwc3 are better
support for scatterlist and, again, throughput
improvements. While on dwc2 got some minor stability
fixes related to soft reset and FIFO usage.
Felipe Tonello has done some good work fixing up our
f_midi gadget and Tal Shorer has implemented a nice
API change for our ULPI bus.
Apart from these, we have our usual set of
non-critical fixes, spelling fixes, build warning
fixes, etc.
Diffstat (limited to 'include/linux/ulpi')
| -rw-r--r-- | include/linux/ulpi/driver.h | 2 | ||||
| -rw-r--r-- | include/linux/ulpi/interface.h | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/ulpi/driver.h b/include/linux/ulpi/driver.h index 80b36ca12e80..a7af21a55248 100644 --- a/include/linux/ulpi/driver.h +++ b/include/linux/ulpi/driver.h @@ -15,7 +15,7 @@ struct ulpi_ops; */ struct ulpi { struct ulpi_device_id id; - struct ulpi_ops *ops; + const struct ulpi_ops *ops; struct device dev; }; diff --git a/include/linux/ulpi/interface.h b/include/linux/ulpi/interface.h index 4de8ab491038..a2011a919eb6 100644 --- a/include/linux/ulpi/interface.h +++ b/include/linux/ulpi/interface.h @@ -4,20 +4,19 @@ #include <linux/types.h> struct ulpi; +struct device; /** * struct ulpi_ops - ULPI register access - * @dev: the interface provider * @read: read operation for ULPI register access * @write: write operation for ULPI register access */ struct ulpi_ops { - struct device *dev; - int (*read)(struct ulpi_ops *ops, u8 addr); - int (*write)(struct ulpi_ops *ops, u8 addr, u8 val); + int (*read)(struct device *dev, u8 addr); + int (*write)(struct device *dev, u8 addr, u8 val); }; -struct ulpi *ulpi_register_interface(struct device *, struct ulpi_ops *); +struct ulpi *ulpi_register_interface(struct device *, const struct ulpi_ops *); void ulpi_unregister_interface(struct ulpi *); #endif /* __LINUX_ULPI_INTERFACE_H */ |