openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Johan Hovold 2016-02-10 12:31:03 +01:00 committed by Greg Kroah-Hartman
parent 5ef545fb8c
commit 8d46ec4981
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/greybus/bundle.h
View File

@ -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)

6
drivers/staging/greybus/loopback.c
View File

@ -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 @@ static int gb_loopback_connection_init(struct gb_connection *connection)
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 @@ static int gb_loopback_connection_init(struct gb_connection *connection)
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);