Skip to contentSkip to conversation

Staging: fsl-mc: Fix up bad parameters to dev_err and dev_dbg

PATCH In review Guenter Roeck 2 participants 2 messages Mar 19, 2016 – Mar 23, 2016 Staging

lore
Share & tools
lore

Guenter Roeck

author
#0 lore raw

PATCH 1/1 Staging: fsl-mc: Fix up bad parameters to dev_err and dev_dbg

The first parameter to dev_dbg() and dev_err() is struct device *, not struct device **.

Fixes de71daf5c839 ("Staging: fsl-mc: Replace pr_debug with dev_dbg")
Fixes 454b0ec8bf99 ("Staging: fsl-mc: Replace pr_err with dev_err")
Cc Bhumika Goyal <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
---
 drivers/staging/fsl-mc/bus/mc-bus.c | 4 ++--
 drivers/staging/fsl-mc/bus/mc-sys.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/fsl-mc/bus/mc-bus.c +2 -2
index 9f77c37bd612..b59455661f4d 100644
@@ -260,14 +260,14 @@ static int get_dprc_icid(struct fsl_mc_io *mc_io,
 
 	error = dprc_open(mc_io, 0, container_id, &dprc_handle);
 	if (error < 0) {
-		dev_err(&mc_io->dev, "dprc_open() failed: %d\n", error);
+		dev_err(mc_io->dev, "dprc_open() failed: %d\n", error);
 		return error;
 	}
 
 	memset(&attr, 0, sizeof(attr));
 	error = dprc_get_attributes(mc_io, 0, dprc_handle, &attr);
 	if (error < 0) {
-		dev_err(&mc_io->dev, "dprc_get_attributes() failed: %d\n",
+		dev_err(mc_io->dev, "dprc_get_attributes() failed: %d\n",
 			error);
 		goto common_cleanup;
 	}
drivers/staging/fsl-mc/bus/mc-sys.c +3 -3
index 8101c469abb0..810a611c1cb0 100644
@@ -328,7 +328,7 @@ 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)) {
-			dev_dbg(&mc_io->dev,
+			dev_dbg(mc_io->dev,
 				"MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n",
 				 mc_io->portal_phys_addr,
 				 (unsigned int)

@@ -370,7 +370,7 @@ 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) {
-			dev_dbg(&mc_io->dev,
+			dev_dbg(mc_io->dev,
 				"MC command timed out (portal: %#llx, obj handle: %#x, command: %#x)\n",
 				 mc_io->portal_phys_addr,
 				 (unsigned int)

@@ -426,7 +426,7 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd)
 		goto common_exit;
 
 	if (status != MC_CMD_STATUS_OK) {
-		dev_dbg(&mc_io->dev,
+		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),
Signature · 1 line
2.5.0
maintainer
#1 lore raw
Quoted 11 lines · Guenter Roeck

The first parameter to dev_dbg() and dev_err() is struct device *, not struct device **.

Fixes de71daf5c839 ("Staging: fsl-mc: Replace pr_debug with dev_dbg")
Fixes 454b0ec8bf99 ("Staging: fsl-mc: Replace pr_err with dev_err")
Cc Bhumika Goyal <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
---
 drivers/staging/fsl-mc/bus/mc-bus.c | 4 ++--
 drivers/staging/fsl-mc/bus/mc-sys.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

Someone else sent a patch for this before you did, I'll add you to that one...

thanks,

greg k-h