diff options
| author | Greg Kroah-Hartman | 2015-08-15 01:45:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-15 01:45:51 +0200 |
| commit | d50f14805ec0f1cf50654e23559d1dcf81c68b26 (patch) | |
| tree | 9e705250a24ffccad8af4c3b1c4386ae508b0c87 /drivers/phy/phy-armada375-usb2.c | |
| parent | Merge tag 'usb-ci-v4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | phy: lpc18xx-usb-otg: fix clock order in phy init (diff) | |
| download | kernel-qcow2-linux-d50f14805ec0f1cf50654e23559d1dcf81c68b26.tar.gz kernel-qcow2-linux-d50f14805ec0f1cf50654e23559d1dcf81c68b26.tar.xz kernel-qcow2-linux-d50f14805ec0f1cf50654e23559d1dcf81c68b26.zip | |
Merge tag 'phy-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
phy: for 4.3
*) Add new NXP USB OTG PHY driver
*) Add vbus/id detection, extcon support and fixes in phy-sun4i-usb
driver
*) Add support to use phy-sun4i-usb driver for sun8i-a23 and sun8i-a33
SoCs
*) Other trivial code cleanups, dropping .owner assignment and constify
phy_ops
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/phy-armada375-usb2.c')
| -rw-r--r-- | drivers/phy/phy-armada375-usb2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/phy/phy-armada375-usb2.c b/drivers/phy/phy-armada375-usb2.c index 8ccc3952c13d..1a3db288c0a9 100644 --- a/drivers/phy/phy-armada375-usb2.c +++ b/drivers/phy/phy-armada375-usb2.c @@ -51,7 +51,7 @@ static int armada375_usb_phy_init(struct phy *phy) return 0; } -static struct phy_ops armada375_usb_phy_ops = { +static const struct phy_ops armada375_usb_phy_ops = { .init = armada375_usb_phy_init, .owner = THIS_MODULE, }; @@ -149,7 +149,6 @@ static struct platform_driver armada375_usb_phy_driver = { .driver = { .of_match_table = of_usb_cluster_table, .name = "armada-375-usb-cluster", - .owner = THIS_MODULE, } }; module_platform_driver(armada375_usb_phy_driver); |