Merge tag 'v4.18-rc6' into for-4.19/block2

[linux-2.6-microblaze.git] / drivers / block / skd_main.c

diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index bc7aea6..87b9e7f 100644 (file)
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -657,8 +657,8 @@ static bool skd_preop_sg_list(struct skd_device *skdev,
 
        if (unlikely(skdev->dbg_level > 1)) {
                dev_dbg(&skdev->pdev->dev,
-                       "skreq=%x sksg_list=%p sksg_dma=%llx\n",
-                       skreq->id, skreq->sksg_list, skreq->sksg_dma_address);
+                       "skreq=%x sksg_list=%p sksg_dma=%pad\n",
+                       skreq->id, skreq->sksg_list, &skreq->sksg_dma_address);
                for (i = 0; i < n_sg; i++) {
                        struct fit_sg_descriptor *sgd = &skreq->sksg_list[i];
 
@@ -1190,8 +1190,8 @@ static void skd_send_fitmsg(struct skd_device *skdev,
 {
        u64 qcmd;
 
-       dev_dbg(&skdev->pdev->dev, "dma address 0x%llx, busy=%d\n",
-               skmsg->mb_dma_address, skd_in_flight(skdev));
+       dev_dbg(&skdev->pdev->dev, "dma address %pad, busy=%d\n",
+               &skmsg->mb_dma_address, skd_in_flight(skdev));
        dev_dbg(&skdev->pdev->dev, "msg_buf %p\n", skmsg->msg_buf);
 
        qcmd = skmsg->mb_dma_address;
@@ -1250,9 +1250,9 @@ static void skd_send_special_fitmsg(struct skd_device *skdev,
                }
 
                dev_dbg(&skdev->pdev->dev,
-                       "skspcl=%p id=%04x sksg_list=%p sksg_dma=%llx\n",
+                       "skspcl=%p id=%04x sksg_list=%p sksg_dma=%pad\n",
                        skspcl, skspcl->req.id, skspcl->req.sksg_list,
-                       skspcl->req.sksg_dma_address);
+                       &skspcl->req.sksg_dma_address);
                for (i = 0; i < skspcl->req.n_sg; i++) {
                        struct fit_sg_descriptor *sgd =
                                &skspcl->req.sksg_list[i];
@@ -2685,8 +2685,8 @@ static int skd_cons_skmsg(struct skd_device *skdev)
 
                WARN(((uintptr_t)skmsg->msg_buf | skmsg->mb_dma_address) &
                     (FIT_QCMD_ALIGN - 1),
-                    "not aligned: msg_buf %p mb_dma_address %#llx\n",
-                    skmsg->msg_buf, skmsg->mb_dma_address);
+                    "not aligned: msg_buf %p mb_dma_address %pad\n",
+                    skmsg->msg_buf, &skmsg->mb_dma_address);
                memset(skmsg->msg_buf, 0, SKD_N_FITMSG_BYTES);
        }