Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edc40a4b authored by Thomas Pugliese's avatar Thomas Pugliese Committed by Greg Kroah-Hartman
Browse files

wusbhc: disable suspend and resume on the root hub. 



Suspend and resume are not currently supported on the wireless root hub.
Remove the suspend and resume op functions in the host controller driver
to avoid constant error messages in the system log.

Signed-off-by: default avatarThomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de5535f5

drivers/usb/host/hwa-hc.c

+0 −2
Original line number Diff line number Diff line
@@ -588,8 +588,6 @@ static struct hc_driver hwahc_hc_driver = { 


	.hub_status_data = wusbhc_rh_status_data,

	.hub_control = wusbhc_rh_control,

	.bus_suspend = wusbhc_rh_suspend,

	.bus_resume = wusbhc_rh_resume,

	.start_port_reset = wusbhc_rh_start_port_reset,

};

drivers/usb/host/whci/hcd.c

+0 −2
Original line number Diff line number Diff line
@@ -231,8 +231,6 @@ static struct hc_driver whc_hc_driver = { 


	.hub_status_data = wusbhc_rh_status_data,

	.hub_control = wusbhc_rh_control,

	.bus_suspend = wusbhc_rh_suspend,

	.bus_resume = wusbhc_rh_resume,

	.start_port_reset = wusbhc_rh_start_port_reset,

};

drivers/usb/wusbcore/rh.c

+0 −20
Original line number Diff line number Diff line
@@ -393,26 +393,6 @@ int wusbhc_rh_control(struct usb_hcd *usb_hcd, u16 reqntype, u16 wValue, 
}

EXPORT_SYMBOL_GPL(wusbhc_rh_control);



int wusbhc_rh_suspend(struct usb_hcd *usb_hcd)

{

	struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);

	dev_err(wusbhc->dev, "%s (%p [%p]) UNIMPLEMENTED\n", __func__,

		usb_hcd, wusbhc);

	/* dump_stack(); */

	return -ENOSYS;

}

EXPORT_SYMBOL_GPL(wusbhc_rh_suspend);



int wusbhc_rh_resume(struct usb_hcd *usb_hcd)

{

	struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);

	dev_err(wusbhc->dev, "%s (%p [%p]) UNIMPLEMENTED\n", __func__,

		usb_hcd, wusbhc);

	/* dump_stack(); */

	return -ENOSYS;

}

EXPORT_SYMBOL_GPL(wusbhc_rh_resume);



int wusbhc_rh_start_port_reset(struct usb_hcd *usb_hcd, unsigned port_idx)

{

	struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);

drivers/usb/wusbcore/wusbhc.h

+0 −2
Original line number Diff line number Diff line
@@ -399,8 +399,6 @@ extern void wusbhc_rh_destroy(struct wusbhc *); 


extern int wusbhc_rh_status_data(struct usb_hcd *, char *);

extern int wusbhc_rh_control(struct usb_hcd *, u16, u16, u16, char *, u16);

extern int wusbhc_rh_suspend(struct usb_hcd *);

extern int wusbhc_rh_resume(struct usb_hcd *);

extern int wusbhc_rh_start_port_reset(struct usb_hcd *, unsigned);



/* MMC handling */