OSDN Git Service

greybus: drop gfp_mask from gb_message_send()
authorAlex Elder <elder@linaro.org>
Mon, 1 Dec 2014 13:53:10 +0000 (07:53 -0600)
committerGreg Kroah-Hartman <greg@kroah.com>
Tue, 2 Dec 2014 04:40:35 +0000 (20:40 -0800)
We will only send messages from process context.  Drop the gfp_mask
parameter from gb_message_send(), and just supply GFP_KERNEL to the
host driver's buffer_send method.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/staging/greybus/operation.c

index 0841ab2..75900d3 100644 (file)
@@ -195,7 +195,7 @@ gb_pending_operation_find(struct gb_connection *connection, u16 operation_id)
        return found ? operation : NULL;
 }
 
-static int gb_message_send(struct gb_message *message, gfp_t gfp_mask)
+static int gb_message_send(struct gb_message *message)
 {
        struct gb_connection *connection = message->operation->connection;
        u16 dest_cport_id = connection->interface_cport_id;
@@ -207,7 +207,7 @@ static int gb_message_send(struct gb_message *message, gfp_t gfp_mask)
                                        dest_cport_id,
                                        message->header,
                                        message->size,
-                                       gfp_mask);
+                                       GFP_KERNEL);
        if (IS_ERR(cookie))
                ret = PTR_ERR(cookie);
        else
@@ -561,7 +561,7 @@ int gb_operation_request_send(struct gb_operation *operation,
 
        /* All set, send the request */
        gb_operation_result_set(operation, -EINPROGRESS);
-       ret = gb_message_send(operation->request, GFP_KERNEL);
+       ret = gb_message_send(operation->request);
        if (ret || callback)
                return ret;