leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

greybus: bootrom: Don't print duplicate error messages

Browse Source 
On failing to find a firmware image, we get these today:

bootrom 1-3.3.1: Firmware request for ara_00000126_00001001_fffe0001_ffe5001a_s2l.tftf has failed : -12
bootrom 1-3.3.1: gb_bootrom_firmware_size_request: failed to download firmware (-12)

Which are more or less duplicate, as they print error for the same root
cause.

With this patch this is all we get now:

bootrom 1-3.3.1: failed to download ara_00000126_00001001_fffe0001_ffe5001a_s2l.tftf firmware (-12)

Reported-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Viresh Kumar 2016-07-22 14:13:41 -07:00 committed by Greg Kroah-Hartman
parent cc90d6fce8
commit 2d6f1c2998
1 changed files with 5 additions and 7 deletions

12
drivers/staging/greybus/bootrom.c
View File

@ -171,10 +171,11 @@ static int download_firmware(struct gb_bootrom *bootrom, u8 stage)
rc = request_firmware(&bootrom->fw, firmware_name,
&connection->bundle->dev);
if (rc)
dev_err(&connection->bundle->dev,
"Firmware request for %s has failed : %d",
if (rc) {
dev_err(&connection->bundle->dev, "failed to download %s firmware (%d)\n",
firmware_name, rc);
}
return rc;
}
@ -200,11 +201,8 @@ static int gb_bootrom_firmware_size_request(struct gb_operation *op)
mutex_lock(&bootrom->mutex);
ret = download_firmware(bootrom, size_request->stage);
if (ret) {
dev_err(dev, "%s: failed to download firmware (%d)\n", __func__,
ret);
if (ret)
goto unlock;
}
if (!gb_operation_response_alloc(op, sizeof(*size_response),
GFP_KERNEL)) {