From: Alex Elder <elder@linaro.org>
Date: Fri, 22 May 2015 14:52:43 +0000 (-0500)
Subject: greybus: endo: pass endo_id to gb_endo_create()
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1521^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee3ecf80284d973e491e653f74b2fd936c50bd2c;p=karo-tx-linux.git

greybus: endo: pass endo_id to gb_endo_create()

We are going to want to defer creating the endo until we receive a
probe operation from the SVC, which will supply the endo id.  Change
gb_endo_create() so it passes the endo_id value as an argument.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index e32d6c41e87e..27062e7a5824 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -177,6 +177,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
 					      size_t buffer_size_max)
 {
 	struct greybus_host_device *hd;
+	u16 endo_id = 0x4755; // FIXME - get endo "ID" from the SVC
 
 	/*
 	 * Validate that the driver implements all of the callbacks
@@ -210,7 +211,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
 	ida_init(&hd->cport_id_map);
 	hd->buffer_size_max = buffer_size_max;
 
-	hd->endo = gb_endo_create(hd);
+	hd->endo = gb_endo_create(hd, endo_id);
 	if (!hd->endo) {
 		greybus_remove_hd(hd);
 		return NULL;
diff --git a/drivers/staging/greybus/endo.c b/drivers/staging/greybus/endo.c
index 859c9c57989d..fb2f7c9c6dd7 100644
--- a/drivers/staging/greybus/endo.c
+++ b/drivers/staging/greybus/endo.c
@@ -423,11 +423,10 @@ static int gb_endo_register(struct greybus_host_device *hd,
 	return retval;
 }
 
-struct gb_endo *gb_endo_create(struct greybus_host_device *hd)
+struct gb_endo *gb_endo_create(struct greybus_host_device *hd, u16 endo_id)
 {
 	struct gb_endo *endo;
 	int retval;
-	u16 endo_id = 0x4755; // FIXME - get endo "ID" from the SVC
 
 	endo = kzalloc(sizeof(*endo), GFP_KERNEL);
 	if (!endo)
diff --git a/drivers/staging/greybus/endo.h b/drivers/staging/greybus/endo.h
index 2920b130ce37..c1ccbcd576f3 100644
--- a/drivers/staging/greybus/endo.h
+++ b/drivers/staging/greybus/endo.h
@@ -47,7 +47,7 @@ struct gb_endo {
 /* Greybus "private" definitions */
 struct greybus_host_device;
 
-struct gb_endo *gb_endo_create(struct greybus_host_device *hd);
+struct gb_endo *gb_endo_create(struct greybus_host_device *hd, u16 endo_id);
 void gb_endo_remove(struct gb_endo *endo);
 
 u8 endo_get_module_id(struct gb_endo *endo, u8 interface_id);