From de71daf5c839b3b3cc8a5b09b4a00107817868de Mon Sep 17 00:00:00 2001 From: Bhumika Goyal Date: Fri, 4 Mar 2016 19:14:52 +0530 Subject: [PATCH] Staging: fsl-mc: Replace pr_debug with dev_dbg This patch replaces pr_debug calls with dev_dbg when the device structure is available as dev_* prints identifying information about the struct device. Done using coccinelle: @r exists@ identifier f, s; identifier x; position p; @@ f(...,struct s *x,...) { <+... when != x == NULL \(pr_err@p\|pr_debug@p\|pr_info\)(...); ...+> } @r2@ identifier fld2; identifier r.s; @@ struct s { ... struct device *fld2; ... }; @@ identifier r.x,r2.fld2; position r.p; @@ ( -pr_err@p +dev_err ( + &x->fld2, ...) | - pr_debug@p + dev_dbg ( + &x->fld2, ...) | - pr_info@p + dev_info ( + &x->fld2, ...) ) Signed-off-by: Bhumika Goyal Signed-off-by: Greg Kroah-Hartman --- drivers/staging/fsl-mc/bus/mc-sys.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c index 6e1489246066..8101c469abb0 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/staging/fsl-mc/bus/mc-sys.c @@ -328,7 +328,8 @@ static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io, MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS); if (time_after_eq(jiffies, jiffies_until_timeout)) { - pr_debug("MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n", + dev_dbg(&mc_io->dev, + "MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n", mc_io->portal_phys_addr, (unsigned int) MC_CMD_HDR_READ_TOKEN(cmd->header), @@ -369,7 +370,8 @@ static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io, udelay(MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS); timeout_usecs -= MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS; if (timeout_usecs == 0) { - pr_debug("MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n", + dev_dbg(&mc_io->dev, + "MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n", mc_io->portal_phys_addr, (unsigned int) MC_CMD_HDR_READ_TOKEN(cmd->header), @@ -424,7 +426,8 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd) goto common_exit; if (status != MC_CMD_STATUS_OK) { - pr_debug("MC command failed: portal: %#llx, obj handle: %#x, command: %#x, status: %s (%#x)\n", + dev_dbg(&mc_io->dev, + "MC command failed: portal: %#llx, obj handle: %#x, command: %#x, status: %s (%#x)\n", mc_io->portal_phys_addr, (unsigned int)MC_CMD_HDR_READ_TOKEN(cmd->header), (unsigned int)MC_CMD_HDR_READ_CMDID(cmd->header), -- 2.39.5