summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/greybus/control.c10
-rw-r--r--drivers/staging/greybus/control.h2
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);