greybus: use protocol_id for numeric values
Switch to using "protocol_id" to refer to a byte-sized numeric
protocol number. A "protocol" will represent a protocol structure
(created in the next patch).
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 dc35425..0388242 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -200,21 +200,21 @@
static void gb_operation_request_handle(struct gb_operation *operation)
{
- u8 protocol = operation->connection->protocol;
+ u8 protocol_id = operation->connection->protocol_id;
/* Subtract one from array size to stay within u8 range */
- if (protocol <= (u8)(ARRAY_SIZE(gb_operation_recv_handlers) - 1)) {
+ if (protocol_id <= (u8)(ARRAY_SIZE(gb_operation_recv_handlers) - 1)) {
gb_operation_recv_handler handler;
- handler = gb_operation_recv_handlers[protocol];
+ handler = gb_operation_recv_handlers[protocol_id];
if (handler) {
handler(operation); /* Handle the request */
return;
}
}
- gb_connection_err(operation->connection, "unrecognized protocol %u\n",
- (unsigned int)protocol);
+ gb_connection_err(operation->connection,
+ "unrecognized protocol id %hhu\n", protocol_id);
operation->result = GB_OP_PROTOCOL_BAD;
gb_operation_complete(operation);
}