Skip to content

Commit

Permalink
wusbhc: disable suspend and resume on the root hub.
Browse files Browse the repository at this point in the history
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: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Thomas Pugliese authored and Greg Kroah-Hartman committed Jun 6, 2013
1 parent de5535f commit edc40a4
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 26 deletions.
2 changes: 0 additions & 2 deletions drivers/usb/host/hwa-hc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/host/whci/hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
20 changes: 0 additions & 20 deletions drivers/usb/wusbcore/rh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/wusbcore/wusbhc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit edc40a4

Please sign in to comment.