diff options
| author |   Viresh Kumar <viresh.kumar@linaro.org> | 2015-08-11 07:36:02 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@google.com> | 2015-08-11 19:33:05 -0700 |
| commit | 507d75c4f4502cae84b50dcb0c246d67913e9ab5 (patch) | |
| tree | 6c735a73a890e8707c41df65b8662b9807a126b3 /drivers/staging | |
| parent | greybus: battery: Drop get_version support (diff) | |
| download | linux-dev-507d75c4f4502cae84b50dcb0c246d67913e9ab5.tar.xz linux-dev-507d75c4f4502cae84b50dcb0c246d67913e9ab5.zip | |
greybus: control: Drop get_version support
This is done from a common place now, no need to replicate it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/greybus/control.c | 10 | ||||
| -rw-r--r-- | drivers/staging/greybus/control.h | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c index a69a703a1848..605e6134d564 100644 --- a/drivers/staging/greybus/control.c +++ b/drivers/staging/greybus/control.c @@ -12,9 +12,6 @@ #include <linux/slab.h> #include "greybus.h" -/* Define get_version() routine */ -define_get_version(gb_control, CONTROL); - /* Get Manifest's size from the interface */ int gb_control_get_manifest_size_operation(struct gb_interface *intf) { @@ -100,7 +97,6 @@ static int gb_control_request_recv(u8 type, struct gb_operation *op) static int gb_control_connection_init(struct gb_connection *connection) { struct gb_control *control; - int ret; control = kzalloc(sizeof(*control), GFP_KERNEL); if (!control) @@ -109,14 +105,10 @@ static int gb_control_connection_init(struct gb_connection *connection) control->connection = connection; connection->private = control; - ret = get_version(control); - if (ret) - kfree(control); - /* Set interface's control connection */ connection->bundle->intf->control = control; - return ret; + return 0; } static void gb_control_connection_exit(struct gb_connection *connection) diff --git a/drivers/staging/greybus/control.h b/drivers/staging/greybus/control.h index 6e41a2b4c70d..3248d965e593 100644 --- a/drivers/staging/greybus/control.h +++ b/drivers/staging/greybus/control.h @@ -12,8 +12,6 @@ struct gb_control { struct gb_connection *connection; - u8 version_major; - u8 version_minor; }; int gb_control_connected_operation(struct gb_control *control, u16 cport_id); |