aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/firmware.c
diff options
context:
space:
mode:
authorGravatar Johan Hovold <johan@hovoldconsulting.com> 2015-11-19 18:28:00 +0100
committerGravatar Greg Kroah-Hartman <gregkh@google.com> 2015-11-19 16:07:48 -0800
commit87f6c976f4104ae5a439ff2d78ea3fe7ce0ac280 (patch)
treebc3b123f07e2d4592f9fa6d5e170e85ab2e0b59e /drivers/staging/greybus/firmware.c
parentgreybus: firmware: fix information leak (diff)
downloadlinux-87f6c976f4104ae5a439ff2d78ea3fe7ce0ac280.tar.gz
linux-87f6c976f4104ae5a439ff2d78ea3fe7ce0ac280.tar.bz2
linux-87f6c976f4104ae5a439ff2d78ea3fe7ce0ac280.zip
greybus: firmware: break long lines
Break lines longer than 80 cols, and clean up an error message while at it. Signed-off-by: Johan Hovold <johan@hovoldconsulting.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/firmware.c')
-rw-r--r--drivers/staging/greybus/firmware.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/greybus/firmware.c b/drivers/staging/greybus/firmware.c
index 4e1530fe9ae5..a95be08c26d9 100644
--- a/drivers/staging/greybus/firmware.c
+++ b/drivers/staging/greybus/firmware.c
@@ -88,7 +88,7 @@ static int gb_firmware_get_firmware(struct gb_operation *op)
struct gb_connection *connection = op->connection;
struct gb_firmware *firmware = connection->private;
const struct firmware *fw = firmware->fw;
- struct gb_firmware_get_firmware_request *firmware_request = op->request->payload;
+ struct gb_firmware_get_firmware_request *firmware_request;
struct gb_firmware_get_firmware_response *firmware_response;
struct device *dev = &connection->bundle->dev;
unsigned int offset, size;
@@ -105,6 +105,7 @@ static int gb_firmware_get_firmware(struct gb_operation *op)
return -EINVAL;
}
+ firmware_request = op->request->payload;
offset = le32_to_cpu(firmware_request->offset);
size = le32_to_cpu(firmware_request->size);
@@ -129,7 +130,7 @@ static int gb_firmware_get_firmware(struct gb_operation *op)
static int gb_firmware_ready_to_boot(struct gb_operation *op)
{
struct gb_connection *connection = op->connection;
- struct gb_firmware_ready_to_boot_request *rtb_request = op->request->payload;
+ struct gb_firmware_ready_to_boot_request *rtb_request;
struct device *dev = &connection->bundle->dev;
u8 status;
@@ -140,6 +141,7 @@ static int gb_firmware_ready_to_boot(struct gb_operation *op)
return -EINVAL;
}
+ rtb_request = op->request->payload;
status = rtb_request->status;
/* Return error if the blob was invalid */
@@ -192,8 +194,10 @@ static int gb_firmware_connection_init(struct gb_connection *connection)
*/
ret = gb_operation_sync(connection, GB_FIRMWARE_TYPE_AP_READY, NULL, 0,
NULL, 0);
- if (ret)
- dev_err(&connection->bundle->dev, "Failed to send AP READY (%d)\n", ret);
+ if (ret) {
+ dev_err(&connection->bundle->dev,
+ "failed to send AP READY: %d\n", ret);
+ }
return 0;
}