mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
greybus: cancel messages, not gbufs
Rework greybus_kill_gbuf() to be oriented toward an operation message rather than a gbuf, and rename it. Signed-off-by: Alex Elder <elder@linaro.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
This commit is contained in:
parent
002fe66a7d
commit
35b1342bb0
1 changed files with 6 additions and 6 deletions
|
@ -122,12 +122,12 @@ static int gb_message_send(struct gb_message *message, gfp_t gfp_mask)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void greybus_kill_gbuf(struct gbuf *gbuf)
|
||||
static void gb_message_cancel(struct gb_message *message)
|
||||
{
|
||||
if (gbuf->status != -EINPROGRESS)
|
||||
if (message->gbuf.status != -EINPROGRESS)
|
||||
return;
|
||||
|
||||
gbuf->hd->driver->buffer_cancel(gbuf->hcd_data);
|
||||
message->gbuf.hd->driver->buffer_cancel(message->gbuf.hcd_data);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -152,7 +152,7 @@ int gb_operation_wait(struct gb_operation *operation)
|
|||
ret = wait_for_completion_interruptible(&operation->completion);
|
||||
/* If interrupted, cancel the in-flight buffer */
|
||||
if (ret < 0)
|
||||
greybus_kill_gbuf(&operation->request.gbuf);
|
||||
gb_message_cancel(&operation->request);
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
@ -489,9 +489,9 @@ void gb_connection_operation_recv(struct gb_connection *connection,
|
|||
void gb_operation_cancel(struct gb_operation *operation)
|
||||
{
|
||||
operation->canceled = true;
|
||||
greybus_kill_gbuf(&operation->request.gbuf);
|
||||
gb_message_cancel(&operation->request);
|
||||
if (operation->response.gbuf.transfer_buffer)
|
||||
greybus_kill_gbuf(&operation->response.gbuf);
|
||||
gb_message_cancel(&operation->response);
|
||||
}
|
||||
|
||||
int gb_operation_init(void)
|
||||
|
|
Loading…
Reference in a new issue