openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: greybus_protocols: remove svc-eject timeout define 

The SVC eject timeout is implementation specific and does not belong in
the protocol header so move it to the svc module.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2016-03-09 12:20:46 +01:00 committed by Greg Kroah-Hartman
parent e676ccd713
commit d18da86b51
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/greybus/greybus_protocols.h
View File

@ -847,7 +847,6 @@ struct gb_svc_intf_reset_request {
} __packed; } __packed;
/* interface reset response has no payload */ /* interface reset response has no payload */
#define GB_SVC_EJECT_TIME 9000
struct gb_svc_intf_eject_request { struct gb_svc_intf_eject_request {
__u8 intf_id; __u8 intf_id;
} __packed; } __packed;

4
drivers/staging/greybus/svc.c
View File

@ -14,6 +14,8 @@
#define SVC_KEY_ARA_BUTTON KEY_A #define SVC_KEY_ARA_BUTTON KEY_A
#define SVC_INTF_EJECT_TIMEOUT 9000
struct gb_svc_deferred_request { struct gb_svc_deferred_request {
struct work_struct work; struct work_struct work;
struct gb_operation *operation; struct gb_operation *operation;
@ -142,7 +144,7 @@ int gb_svc_intf_eject(struct gb_svc *svc, u8 intf_id)
ret = gb_operation_sync_timeout(svc->connection, ret = gb_operation_sync_timeout(svc->connection,
GB_SVC_TYPE_INTF_EJECT, &request, GB_SVC_TYPE_INTF_EJECT, &request,
sizeof(request), NULL, 0, sizeof(request), NULL, 0,
GB_SVC_EJECT_TIME); SVC_INTF_EJECT_TIMEOUT);
if (ret) { if (ret) {
dev_err(&svc->dev, "failed to eject interface %u\n", intf_id); dev_err(&svc->dev, "failed to eject interface %u\n", intf_id);
return ret; return ret;