greybus: specify type when creating an operation

The type of an operation belongs in the operation header, which
shouldn't be touched by users of the interface.  So specify it
at operation creation time.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 75f6e50b2ee6fd04f92ddfc46fc1c330d7f50dc0..03f6660616b33f976bce0afae1626936c38fa80a 100644 (file)
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -111,7 +111,7 @@ static void gbuf_out_callback(struct gbuf *gbuf)
  * failure occurs due to memory exhaustion.
  */
 struct gb_operation *gb_operation_create(struct gb_connection *connection,
-                                       size_t size)
+                                       size_t size, u8 type)
 {
        struct gb_operation *operation;
        struct gb_operation_msg_hdr *header;
@@ -139,8 +139,9 @@ struct gb_operation *gb_operation_create(struct gb_connection *connection,
        /* Fill in the header structure and payload pointer */
        operation->gbuf = gbuf;
        header = (struct gb_operation_msg_hdr *)&gbuf->transfer_buffer;
-       header->id = 0;
        header->size = cpu_to_le16(size);
+       header->id = 0;         /* Filled in when submitted */
+       header->type = type;
        operation->payload = (char *)header + sizeof(*header);
 
        operation->callback = NULL;     /* set at submit time */

diff --git a/drivers/staging/greybus/operation.h b/drivers/staging/greybus/operation.h
index 96a7a0fcba562c63cca6f3fccc2ffd4e617be6de..0dff703bb2f4efd26a204fd415aa34e74b5426df 100644 (file)
--- a/drivers/staging/greybus/operation.h
+++ b/drivers/staging/greybus/operation.h
@@ -60,7 +60,7 @@ struct gb_operation {
 };
 
 struct gb_operation *gb_operation_create(struct gb_connection *connection,
-                                       size_t size);
+                                       size_t size, u8 type);
 void gb_operation_destroy(struct gb_operation *operation);
 
 int gb_operation_wait(struct gb_operation *operation);