summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/control.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2016-07-21 22:41:05 -0700
committerGreg Kroah-Hartman <gregkh@google.com>2016-07-22 13:57:11 -0700
commit553cba82b1ada07c8d29405c4900a66891c06052 (patch)
tree39a7abd113bd97f384653f885faa4457526a29f5 /drivers/staging/greybus/control.c
parente514dec730284da080286bdf7229d21c2be68b24 (diff)
downloadop-kernel-dev-553cba82b1ada07c8d29405c4900a66891c06052.zip
op-kernel-dev-553cba82b1ada07c8d29405c4900a66891c06052.tar.gz
greybus: control: Print bundle-id in print messages
The new power management specific operations added to the control protocol do not print the bundle-id in the error messages and it is not possible to identify which bundle-id the operation failed for. Fix that and do minor rewriting of the print messages to make them more readable. Tested on EVT 2.0 with gpbridge-test module. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Sandeep Patil <sspatil@google.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.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c
index a08a79d..d7fd378 100644
--- a/drivers/staging/greybus/control.c
+++ b/drivers/staging/greybus/control.c
@@ -259,14 +259,14 @@ int gb_control_bundle_suspend(struct gb_control *control, u8 bundle_id)
GB_CONTROL_TYPE_BUNDLE_SUSPEND, &request,
sizeof(request), &response, sizeof(response));
if (ret) {
- dev_err(&control->dev,
- "failed to send bundle suspend: %d\n", ret);
+ dev_err(&control->dev, "failed to send bundle %u suspend: %d\n",
+ bundle_id, ret);
return ret;
}
if (response.status != GB_CONTROL_BUNDLE_PM_OK) {
- dev_err(&control->dev,
- "bundle error while suspending: %d\n", response.status);
+ dev_err(&control->dev, "failed to suspend bundle %u: %d\n",
+ bundle_id, response.status);
return gb_control_bundle_pm_status_map(response.status);
}
@@ -284,14 +284,14 @@ int gb_control_bundle_resume(struct gb_control *control, u8 bundle_id)
GB_CONTROL_TYPE_BUNDLE_RESUME, &request,
sizeof(request), &response, sizeof(response));
if (ret) {
- dev_err(&control->dev,
- "failed to send bundle resume: %d\n", ret);
+ dev_err(&control->dev, "failed to send bundle %u resume: %d\n",
+ bundle_id, ret);
return ret;
}
if (response.status != GB_CONTROL_BUNDLE_PM_OK) {
- dev_err(&control->dev,
- "bundle error while resuming: %d\n", response.status);
+ dev_err(&control->dev, "failed to resume bundle %u: %d\n",
+ bundle_id, response.status);
return gb_control_bundle_pm_status_map(response.status);
}
@@ -310,13 +310,14 @@ int gb_control_bundle_deactivate(struct gb_control *control, u8 bundle_id)
sizeof(request), &response, sizeof(response));
if (ret) {
dev_err(&control->dev,
- "failed to send bundle deactivate: %d\n", ret);
+ "failed to send bundle %u deactivate: %d\n", bundle_id,
+ ret);
return ret;
}
if (response.status != GB_CONTROL_BUNDLE_PM_OK) {
- dev_err(&control->dev,
- "bundle error while deactivating: %d\n", response.status);
+ dev_err(&control->dev, "failed to deactivate bundle %u: %d\n",
+ bundle_id, response.status);
return gb_control_bundle_pm_status_map(response.status);
}
@@ -338,13 +339,14 @@ int gb_control_bundle_activate(struct gb_control *control, u8 bundle_id)
sizeof(request), &response, sizeof(response));
if (ret) {
dev_err(&control->dev,
- "failed to send bundle activate: %d\n", ret);
+ "failed to send bundle %u activate: %d\n", bundle_id,
+ ret);
return ret;
}
if (response.status != GB_CONTROL_BUNDLE_PM_OK) {
- dev_err(&control->dev,
- "bundle error while activating: %d\n", response.status);
+ dev_err(&control->dev, "failed to activate bundle %u: %d\n",
+ bundle_id, response.status);
return gb_control_bundle_pm_status_map(response.status);
}
OpenPOWER on IntegriCloud