summaryrefslogtreecommitdiff
path: root/include/linux/usb
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2023-11-28 17:32:24 +0300
committerThomas Zimmermann <tzimmermann@suse.de>2023-11-28 17:32:24 +0300
commit26b9a880d24cf94342ae2b259e2a220338559789 (patch)
tree3f8dfcd217984dc884e4d532fe310def25494f09 /include/linux/usb
parent0d3abd456be45369235dd75793ce26f07900044c (diff)
parenta13fee31f56449fc600d9e064c7b32302f92dcef (diff)
downloadlinux-26b9a880d24cf94342ae2b259e2a220338559789.tar.xz
Merge drm/drm-next into drm-misc-next
Backmerging to get commit 8d6ef26501b9 ("drm/ast: Disconnect BMC if physical connector is connected") into drm-misc-next. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'include/linux/usb')
-rw-r--r--include/linux/usb/phy.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index b513749582d7..e4de6bc1f69b 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -144,10 +144,6 @@ struct usb_phy {
*/
int (*set_wakeup)(struct usb_phy *x, bool enabled);
- /* notify phy port status change */
- int (*notify_port_status)(struct usb_phy *x, int port,
- u16 portstatus, u16 portchange);
-
/* notify phy connect status change */
int (*notify_connect)(struct usb_phy *x,
enum usb_device_speed speed);
@@ -321,15 +317,6 @@ usb_phy_set_wakeup(struct usb_phy *x, bool enabled)
}
static inline int
-usb_phy_notify_port_status(struct usb_phy *x, int port, u16 portstatus, u16 portchange)
-{
- if (x && x->notify_port_status)
- return x->notify_port_status(x, port, portstatus, portchange);
- else
- return 0;
-}
-
-static inline int
usb_phy_notify_connect(struct usb_phy *x, enum usb_device_speed speed)
{
if (x && x->notify_connect)