From: Johan Hovold Date: Wed, 25 Nov 2015 14:59:16 +0000 (+0100) Subject: greybus: operation: handle static connections X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=25cdd7aa5e67c09d65a5a2a5da5fc01ebf6483fe;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git greybus: operation: handle static connections Use the host-device device and connection name for error messages, as the operation code can not assume that a connection has a bundle. Note that the "initial" svc connection has never had a bundle. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c index 16438803fce2..01ad08bc85d0 100644 --- a/drivers/staging/greybus/operation.c +++ b/drivers/staging/greybus/operation.c @@ -217,7 +217,8 @@ static void gb_message_cancel(struct gb_message *message) static void gb_operation_request_handle(struct gb_operation *operation) { - struct gb_protocol *protocol = operation->connection->protocol; + struct gb_connection *connection = operation->connection; + struct gb_protocol *protocol = connection->protocol; int status; int ret; @@ -227,18 +228,18 @@ static void gb_operation_request_handle(struct gb_operation *operation) if (protocol->request_recv) { status = protocol->request_recv(operation->type, operation); } else { - dev_err(&operation->connection->bundle->dev, - "unexpected incoming request type 0x%02hhx\n", - operation->type); + dev_err(&connection->hd->dev, + "%s: unexpected incoming request of type 0x%02hhx\n", + connection->name, operation->type); status = -EPROTONOSUPPORT; } ret = gb_operation_response_send(operation, status); if (ret) { - dev_err(&operation->connection->bundle->dev, - "failed to send response %d for type 0x%02hhx: %d\n", - status, operation->type, ret); + dev_err(&connection->hd->dev, + "%s: failed to send response %d for type 0x%02hhx: %d\n", + connection->name, status, operation->type, ret); return; } } @@ -743,7 +744,7 @@ static int gb_operation_response_send(struct gb_operation *operation, /* Record the result */ if (!gb_operation_result_set(operation, errno)) { - dev_err(&connection->bundle->dev, "request result already set\n"); + dev_err(&connection->hd->dev, "request result already set\n"); return -EIO; /* Shouldn't happen */ } @@ -795,9 +796,9 @@ void greybus_message_sent(struct gb_host_device *hd, */ if (message == operation->response) { if (status) { - dev_err(&connection->bundle->dev, - "error sending response type 0x%02hhx: %d\n", - operation->type, status); + dev_err(&connection->hd->dev, + "%s: error sending response 0x%02hhx: %d\n", + connection->name, operation->type, status); } gb_operation_put_active(operation); gb_operation_put(operation); @@ -827,8 +828,9 @@ static void gb_connection_recv_request(struct gb_connection *connection, operation = gb_operation_create_incoming(connection, operation_id, type, data, size); if (!operation) { - dev_err(&connection->bundle->dev, - "can't create incoming operation\n"); + dev_err(&connection->hd->dev, + "%s: can't create incoming operation\n", + connection->name); return; } @@ -865,17 +867,19 @@ static void gb_connection_recv_response(struct gb_connection *connection, operation = gb_operation_find_outgoing(connection, operation_id); if (!operation) { - dev_err(&connection->bundle->dev, - "unexpected response 0x%04hx received\n", operation_id); + dev_err(&connection->hd->dev, + "%s: unexpected response id 0x%04hx received\n", + connection->name, operation_id); return; } message = operation->response; message_size = sizeof(*message->header) + message->payload_size; if (!errno && size != message_size) { - dev_err(&connection->bundle->dev, - "malformed response of type 0x%02hhx received (%zu != %zu)\n", - message->header->type, size, message_size); + dev_err(&connection->hd->dev, + "%s: malformed response 0x%02hhx received (%zu != %zu)\n", + connection->name, message->header->type, size, + message_size); errno = -EMSGSIZE; } trace_gb_message_recv_response(operation->response); @@ -902,17 +906,18 @@ void gb_connection_recv(struct gb_connection *connection, void *data, size_t size) { struct gb_operation_msg_hdr header; - struct device *dev = &connection->bundle->dev; + struct device *dev = &connection->hd->dev; size_t msg_size; u16 operation_id; if (connection->state != GB_CONNECTION_STATE_ENABLED) { - dev_warn(dev, "dropping %zu received bytes\n", size); + dev_warn(dev, "%s: dropping %zu received bytes\n", + connection->name, size); return; } if (size < sizeof(header)) { - dev_err(dev, "short message received\n"); + dev_err(dev, "%s: short message received\n", connection->name); return; } @@ -921,9 +926,9 @@ void gb_connection_recv(struct gb_connection *connection, msg_size = le16_to_cpu(header.size); if (size < msg_size) { dev_err(dev, - "incomplete message 0x%04hx of type 0x%02hhx received (%zu < %zu)\n", - le16_to_cpu(header.operation_id), header.type, size, - msg_size); + "%s: incomplete message 0x%04hx of type 0x%02hhx received (%zu < %zu)\n", + connection->name, le16_to_cpu(header.operation_id), + header.type, size, msg_size); return; /* XXX Should still complete operation */ } @@ -1030,9 +1035,9 @@ int gb_operation_sync_timeout(struct gb_connection *connection, int type, ret = gb_operation_request_send_sync_timeout(operation, timeout); if (ret) { - dev_err(&connection->bundle->dev, - "synchronous operation of type 0x%02hhx failed: %d\n", - type, ret); + dev_err(&connection->hd->dev, + "%s: synchronous operation of type 0x%02hhx failed: %d\n", + connection->name, type, ret); } else { if (response_size) { memcpy(response, operation->response->payload,