From: Johan Hovold <johan@hovoldconsulting.com>
Date: Wed, 10 Feb 2016 11:31:03 +0000 (+0100)
Subject: greybus: bundle: remove private data field
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~713
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8d46ec49819599d33ee5cffd43b19bf21f9472b8;p=karo-tx-linux.git

greybus: bundle: remove private data field

Remove the private data field from the bundle structure as it is no
longer needed. Bundle drivers can use the driver data field in the
bundle device.

Update the only current user to use the connection private data until it
has been converted to a bundle driver.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/bundle.h b/drivers/staging/greybus/bundle.h
index 48fb3fd76817..18b125e8169b 100644
--- a/drivers/staging/greybus/bundle.h
+++ b/drivers/staging/greybus/bundle.h
@@ -29,7 +29,6 @@ struct gb_bundle {
 	u8			*state;
 
 	struct list_head	links;	/* interface->bundles */
-	void			*private;
 };
 #define to_gb_bundle(d) container_of(d, struct gb_bundle, dev)
 
diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c
index 3f32dee1ec93..66b3fcaca9b0 100644
--- a/drivers/staging/greybus/loopback.c
+++ b/drivers/staging/greybus/loopback.c
@@ -1121,7 +1121,7 @@ static int gb_loopback_connection_init(struct gb_connection *connection)
 	gb->file = debugfs_create_file(name, S_IFREG | S_IRUGO, gb_dev.root, gb,
 				       &gb_loopback_debugfs_latency_ops);
 	gb->connection = connection;
-	connection->bundle->private = gb;
+	connection->private = gb;
 
 	gb->id = ida_simple_get(&loopback_ida, 0, 0, GFP_KERNEL);
 	if (gb->id < 0) {
@@ -1177,7 +1177,6 @@ out_dev:
 	ida_simple_remove(&loopback_ida, gb->id);
 out_ida:
 	debugfs_remove(gb->file);
-	connection->bundle->private = NULL;
 out_kzalloc:
 	kfree(gb);
 
@@ -1186,13 +1185,12 @@ out_kzalloc:
 
 static void gb_loopback_connection_exit(struct gb_connection *connection)
 {
-	struct gb_loopback *gb = connection->bundle->private;
+	struct gb_loopback *gb = connection->private;
 	unsigned long flags;
 
 	if (!IS_ERR_OR_NULL(gb->task))
 		kthread_stop(gb->task);
 
-	connection->bundle->private = NULL;
 	kfifo_free(&gb->kfifo_lat);
 	kfifo_free(&gb->kfifo_ts);
 	gb_connection_latency_tag_disable(connection);