From: Johan Hovold Date: Tue, 19 Jan 2016 11:51:19 +0000 (+0100) Subject: greybus: svc: store protocol version X-Git-Tag: v4.14-rc1~2366^2~378^2~21^2~793 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=357de006573f0dbbd5e214dd3f2fe808157ec530;p=platform%2Fkernel%2Flinux-rpi.git greybus: svc: store protocol version Store the "negotiated" protocol version to use in the svc state struct instead of the connection struct. The generic concept of a connection version is going away in favour of bundle-class versions. Reviewed-by: Viresh Kumar Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c index fcdee90..bc64f48 100644 --- a/drivers/staging/greybus/svc.c +++ b/drivers/staging/greybus/svc.c @@ -383,15 +383,15 @@ static int gb_svc_version_request(struct gb_operation *op) return -ENOTSUPP; } - connection->module_major = request->major; - connection->module_minor = request->minor; + svc->protocol_major = request->major; + svc->protocol_minor = request->minor; if (!gb_operation_response_alloc(op, sizeof(*response), GFP_KERNEL)) return -ENOMEM; response = op->response->payload; - response->major = connection->module_major; - response->minor = connection->module_minor; + response->major = svc->protocol_major; + response->minor = svc->protocol_minor; return 0; } diff --git a/drivers/staging/greybus/svc.h b/drivers/staging/greybus/svc.h index 8567615..4abc5ef 100644 --- a/drivers/staging/greybus/svc.h +++ b/drivers/staging/greybus/svc.h @@ -27,6 +27,9 @@ struct gb_svc { u16 endo_id; u8 ap_intf_id; + + u8 protocol_major; + u8 protocol_minor; }; #define to_gb_svc(d) container_of(d, struct gb_svc, d)