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-rockchip-usb.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-rockchip-usb.c')
-rw-r--r-- | drivers/phy/phy-rockchip-usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c index 7d4c33643768..5a5c073e72fe 100644 --- a/drivers/phy/phy-rockchip-usb.c +++ b/drivers/phy/phy-rockchip-usb.c @@ -84,7 +84,7 @@ static int rockchip_usb_phy_power_on(struct phy *_phy) return 0; } -static struct phy_ops ops = { +static const struct phy_ops ops = { .power_on = rockchip_usb_phy_power_on, .power_off = rockchip_usb_phy_power_off, .owner = THIS_MODULE, @@ -146,7 +146,6 @@ static struct platform_driver rockchip_usb_driver = { .probe = rockchip_usb_phy_probe, .driver = { .name = "rockchip-usb-phy", - .owner = THIS_MODULE, .of_match_table = rockchip_usb_phy_dt_ids, }, }; |