| Message ID | 20171010143918.5wl2h7gvyopuinv5@aishwarya (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 02c6340ae36f..82f998ab5a52 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -669,7 +669,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers); static void power_supply_dev_release(struct device *dev) { struct power_supply *psy = container_of(dev, struct power_supply, dev); - pr_debug("device: '%s': %s\n", dev_name(dev), __func__); + dev_dbg(dev, "%s\n", __func__); kfree(psy); } diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index a5915f498eea..bbcaee56db9d 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -743,7 +743,7 @@ static int twl4030bci_state(struct twl4030_bci *bci) ret = twl4030_bci_read(TWL4030_BCIMSTATEC, &state); if (ret) { - pr_err("twl4030_bci: error reading BCIMSTATEC\n"); + dev_err(bci->dev, "error reading BCIMSTATEC\n"); return ret; }
Use kernel preferred dev_* family of functions in place of pr_*, wherever a device object is present. Done with the help of coccinelle. Signed-off-by: Aishwarya Pant <aishpant@gmail.com> --- Changes in v2: - Remove device name from log message as it is already present in the dev_* functions The following cocci script was used to make the patch: @r exists@ identifier f, s, x; position p; @@ f(..., struct s *x,...) { <+... when != x == NULL \(pr_err@p\|pr_debug@p\|pr_info@p\|pr_warn@p\)(...); ...+> } @struc@ identifier dev, r.s; @@ struct s { ... struct device *dev; ... }; @@ identifier r.x, struc.dev; position r.p; @@ ( - pr_err@p + dev_err | - pr_warn@p + dev_warn | - pr_info@p + dev_info | - pr_debug@p + dev_dbg ) ( + x->dev, ...) @rr exists@ local idexpression struct device *dev; @@ <+... dev ...+> ( - pr_err + dev_err | - pr_info + dev_info | - pr_warn + dev_warn | - pr_debug + dev_dbg ) ( + dev, ...) --- drivers/power/supply/power_supply_core.c | 2 +- drivers/power/supply/twl4030_charger.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)