summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/core.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@hovoldconsulting.com>2016-01-19 12:51:14 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2016-01-19 12:17:13 -0800
commite217ae762bccb0ba0109887cefec3e20e5549a48 (patch)
treefac7fea51714f8eb5ec281812e75b333f4f3c27d /drivers/staging/greybus/core.c
parent6bd6e148930b6f6dff7a6d664b37ba76d6d2c75e (diff)
greybus: control: drop legacy-protocol dependency
Drop dependency on the legacy protocol abstraction. Instead implement the protocol-specific version request directly, and use the new interface for managing the control connection. Note that the version request is being removed from most protocols, but we need to keep the current request for the control protocol as-is indefinitely to maintain backwards compatibility (e.g. with the ES2/ES3 bootrom). Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Johan Hovold <johan@hovoldconsulting.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/core.c')
-rw-r--r--drivers/staging/greybus/core.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 493f3920aaf0..6674b2728f98 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -234,12 +234,6 @@ static int __init gb_init(void)
goto error_operation;
}
- retval = gb_control_protocol_init();
- if (retval) {
- pr_err("gb_control_protocol_init failed\n");
- goto error_control;
- }
-
retval = gb_svc_protocol_init();
if (retval) {
pr_err("gb_svc_protocol_init failed\n");
@@ -265,8 +259,6 @@ error_legacy:
error_firmware:
gb_svc_protocol_exit();
error_svc:
- gb_control_protocol_exit();
-error_control:
gb_operation_exit();
error_operation:
gb_hd_exit();
@@ -284,7 +276,6 @@ static void __exit gb_exit(void)
gb_legacy_exit();
gb_firmware_protocol_exit();
gb_svc_protocol_exit();
- gb_control_protocol_exit();
gb_operation_exit();
gb_hd_exit();
bus_unregister(&greybus_bus_type);