staging: fsl-mc: fix formating of phys_addr_t on 32 bits
authorLaurentiu Tudor <laurentiu.tudor@nxp.com>
Wed, 19 Jul 2017 11:42:29 +0000 (14:42 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Jul 2017 15:23:27 +0000 (08:23 -0700)
Use correct format specifier for phys_addr_t variables (%pa) instead
of %llx. This fixes these warnings on 32 bit targets:
 "format '%llx' expects argument of type 'long long unsigned int',
  but argument 4 has type 'phys_addr_t' [-Wformat=]"

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fsl-mc/bus/mc-io.c
drivers/staging/fsl-mc/bus/mc-sys.c

index 35221a17858b970930b08fdae522f0c4096c802d..4e6f99a62cf00f5e582545164ee3dc2b902975a5 100644 (file)
@@ -129,8 +129,8 @@ int __must_check fsl_create_mc_io(struct device *dev,
                                      "mc_portal");
        if (!res) {
                dev_err(dev,
-                       "devm_request_mem_region failed for MC portal %#llx\n",
-                       mc_portal_phys_addr);
+                       "devm_request_mem_region failed for MC portal %pa\n",
+                       &mc_portal_phys_addr);
                return -EBUSY;
        }
 
@@ -139,8 +139,8 @@ int __must_check fsl_create_mc_io(struct device *dev,
                                                   mc_portal_size);
        if (!mc_portal_virt_addr) {
                dev_err(dev,
-                       "devm_ioremap_nocache failed for MC portal %#llx\n",
-                       mc_portal_phys_addr);
+                       "devm_ioremap_nocache failed for MC portal %pa\n",
+                       &mc_portal_phys_addr);
                return -ENXIO;
        }
 
index 012abd5690d7c47e29a2246a02f15be131928262..195d9f347788d2af4ea6cffedd070758162ef5b6 100644 (file)
@@ -196,8 +196,8 @@ static int mc_polling_wait_preemptible(struct fsl_mc_io *mc_io,
 
                if (time_after_eq(jiffies, jiffies_until_timeout)) {
                        dev_dbg(mc_io->dev,
-                               "MC command timed out (portal: %#llx, dprc handle: %#x, command: %#x)\n",
-                                mc_io->portal_phys_addr,
+                               "MC command timed out (portal: %pa, dprc handle: %#x, command: %#x)\n",
+                                &mc_io->portal_phys_addr,
                                 (unsigned int)mc_cmd_hdr_read_token(cmd),
                                 (unsigned int)mc_cmd_hdr_read_cmdid(cmd));
 
@@ -236,8 +236,8 @@ static int mc_polling_wait_atomic(struct fsl_mc_io *mc_io,
                timeout_usecs -= MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS;
                if (timeout_usecs == 0) {
                        dev_dbg(mc_io->dev,
-                               "MC command timed out (portal: %#llx, dprc handle: %#x, command: %#x)\n",
-                                mc_io->portal_phys_addr,
+                               "MC command timed out (portal: %pa, dprc handle: %#x, command: %#x)\n",
+                                &mc_io->portal_phys_addr,
                                 (unsigned int)mc_cmd_hdr_read_token(cmd),
                                 (unsigned int)mc_cmd_hdr_read_cmdid(cmd));
 
@@ -290,8 +290,8 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd)
 
        if (status != MC_CMD_STATUS_OK) {
                dev_dbg(mc_io->dev,
-                       "MC command failed: portal: %#llx, dprc handle: %#x, command: %#x, status: %s (%#x)\n",
-                        mc_io->portal_phys_addr,
+                       "MC command failed: portal: %pa, dprc handle: %#x, command: %#x, status: %s (%#x)\n",
+                        &mc_io->portal_phys_addr,
                         (unsigned int)mc_cmd_hdr_read_token(cmd),
                         (unsigned int)mc_cmd_hdr_read_cmdid(cmd),
                         mc_status_to_string(status),