shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "usb: gadget: Add function wakeup support"

Browse Source 
This reverts commit e36d975b04 which is
commit f0db885fb0 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I56b3a1daccf44443aa4142534777b97bb3a70d14
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-11-16 10:11:27 +00:00
parent 56f28f2269
commit 983df5e9ef
3 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/usb/gadget/composite.c
View File

@@ -490,46 +490,6 @@ int usb_interface_id(struct usb_configuration *config,
}
EXPORT_SYMBOL_GPL(usb_interface_id);
/**
* usb_func_wakeup - sends function wake notification to the host.
* @func: function that sends the remote wakeup notification.
*
* Applicable to devices operating at enhanced superspeed when usb
* functions are put in function suspend state and armed for function
* remote wakeup. On completion, function wake notification is sent. If
* the device is in low power state it tries to bring the device to active
* state before sending the wake notification. Since it is a synchronous
* call, caller must take care of not calling it in interrupt context.
* For devices operating at lower speeds returns negative errno.
*
* Returns zero on success, else negative errno.
*/
int usb_func_wakeup(struct usb_function *func)
{
struct usb_gadget *gadget = func->config->cdev->gadget;
int id;
if (!gadget->ops->func_wakeup)
return -EOPNOTSUPP;
if (!func->func_wakeup_armed) {
ERROR(func->config->cdev, "not armed for func remote wakeup\n");
return -EINVAL;
}
for (id = 0; id < MAX_CONFIG_INTERFACES; id++)
if (func->config->interface[id] == func)
break;
if (id == MAX_CONFIG_INTERFACES) {
ERROR(func->config->cdev, "Invalid function\n");
return -EINVAL;
}
return gadget->ops->func_wakeup(gadget, id);
}
EXPORT_SYMBOL_GPL(usb_func_wakeup);
static u8 encode_bMaxPower(enum usb_device_speed speed,
struct usb_configuration *c)
{

6
include/linux/usb/composite.h
View File

@@ -149,9 +149,6 @@ struct usb_os_desc_table {
* GetStatus() request when the recipient is Interface.
* @func_suspend: callback to be called when
* SetFeature(FUNCTION_SUSPEND) is reseived
* @func_suspended: Indicates whether the function is in function suspend state.
* @func_wakeup_armed: Indicates whether the function is armed by the host for
* wakeup signaling.
*
* A single USB function uses one or more interfaces, and should in most
* cases support operation at both full and high speeds. Each function is
@@ -222,8 +219,6 @@ struct usb_function {
int (*get_status)(struct usb_function *);
int (*func_suspend)(struct usb_function *,
u8 suspend_opt);
bool func_suspended;
bool func_wakeup_armed;
/* private: */
/* internals */
struct list_head list;
@@ -245,7 +240,6 @@ int config_ep_by_speed_and_alt(struct usb_gadget *g, struct usb_function *f,
int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,
struct usb_ep *_ep);
int usb_func_wakeup(struct usb_function *func);
#define MAX_CONFIG_INTERFACES 16 /* arbitrary; max 255 */

1
include/linux/usb/gadget.h
View File

@@ -315,7 +315,6 @@ struct usb_udc;
struct usb_gadget_ops {
int (*get_frame)(struct usb_gadget *);
int (*wakeup)(struct usb_gadget *);
int (*func_wakeup)(struct usb_gadget *gadget, int intf_id);
int (*set_selfpowered) (struct usb_gadget *, int is_selfpowered);
int (*vbus_session) (struct usb_gadget *, int is_active);
int (*vbus_draw) (struct usb_gadget *, unsigned mA);