diff options
| author | Johan Hovold <johan@hovoldconsulting.com> | 2015-11-25 15:59:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-11-25 15:39:16 -0800 |
| commit | 7fa530ad1b2d160ec9e76b3b5a1ac2e302e8f3bf (patch) | |
| tree | 0346cf77592c08ddb2588a1e4ea6de47ba31caf9 /drivers/staging/greybus/control.c | |
| parent | 35822c04a5c232a7899d43a74f0d2fca5077b196 (diff) | |
| download | op-kernel-dev-7fa530ad1b2d160ec9e76b3b5a1ac2e302e8f3bf.zip op-kernel-dev-7fa530ad1b2d160ec9e76b3b5a1ac2e302e8f3bf.tar.gz | |
greybus: control: do not assume a control bundle
The control bundle is going away so update the code.
Also remove defensive WARN_ON which would not just warn if our
implementation is broken, but also leak further memory unnecessarily.
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/control.c')
| -rw-r--r-- | drivers/staging/greybus/control.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c index ffc07a4..2cc1917 100644 --- a/drivers/staging/greybus/control.c +++ b/drivers/staging/greybus/control.c @@ -22,9 +22,8 @@ int gb_control_get_manifest_size_operation(struct gb_interface *intf) ret = gb_operation_sync(connection, GB_CONTROL_TYPE_GET_MANIFEST_SIZE, NULL, 0, &response, sizeof(response)); if (ret) { - dev_err(&connection->bundle->dev, - "%s: Manifest size get operation failed (%d)\n", - __func__, ret); + dev_err(&connection->intf->dev, + "failed to get manifest size: %d\n", ret); return ret; } @@ -72,7 +71,7 @@ static int gb_control_connection_init(struct gb_connection *connection) connection->private = control; /* Set interface's control connection */ - connection->bundle->intf->control = control; + connection->intf->control = control; return 0; } @@ -81,10 +80,7 @@ static void gb_control_connection_exit(struct gb_connection *connection) { struct gb_control *control = connection->private; - if (WARN_ON(connection->bundle->intf->control != control)) - return; - - connection->bundle->intf->control = NULL; + connection->intf->control = NULL; kfree(control); } |
