skd: Replaced custom debug PRINTKs with pr_debug

Replaced DPRINTK() and VPRINTK() with pr_debug().

Signed-off-by: Ramprasad C <ramprasad.chinthekindi@hgst.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 407 insertions, 284 deletions

diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 308bf474dc39..ab17bff6b4f9 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -68,14 +68,6 @@ enum {
         SKD_FLUSH_DATA_SECOND,
 };
 
-#define DPRINTK(skdev, fmt, args ...) \
-        do { \
-                if (unlikely((skdev)->dbg_level > 0)) { \
-                        pr_err("%s:%s:%d " fmt, (skdev)->name,  \
-                               __func__, __LINE__, ## args); \
-                } \
-        } while (0)
-
 #define SKD_ASSERT(expr) \
         do { \
                 if (unlikely(!(expr))) { \
@@ -84,15 +76,6 @@ enum {
                 } \
         } while (0)
 
-#define VPRINTK(skdev, fmt, args ...) \
-        do { \
-                if (unlikely((skdev)->dbg_level > 1)) { \
-                        pr_err("%s:%s:%d " fmt, (skdev)->name,  \
-                               __func__, __LINE__, ## args); \
-                } \
-        } while (0)
-
-
 #define DRV_NAME "skd"
 #define DRV_VERSION "2.2.1"
 #define DRV_BUILD_ID "0260"
@@ -408,7 +391,8 @@ static inline u32 skd_reg_read32(struct skd_device *skdev, u32 offset)
                 barrier();
                 val = readl(skdev->mem_map[1] + offset);
                 barrier();
-                VPRINTK(skdev, "offset %x = %x\n", offset, val);
+                pr_debug("%s:%s:%d offset %x = %x\n",
+                         skdev->name, __func__, __LINE__, offset, val);
                 return val;
         }
 
@@ -424,7 +408,8 @@ static inline void skd_reg_write32(struct skd_device *skdev, u32 val,
                 barrier();
                 writel(val, skdev->mem_map[1] + offset);
                 barrier();
-                VPRINTK(skdev, "offset %x = %x\n", offset, val);
+                pr_debug("%s:%s:%d offset %x = %x\n",
+                         skdev->name, __func__, __LINE__, offset, val);
         }
 }
 
@@ -438,7 +423,8 @@ static inline void skd_reg_write64(struct skd_device *skdev, u64 val,
                 barrier();
                 writeq(val, skdev->mem_map[1] + offset);
                 barrier();
-                VPRINTK(skdev, "offset %x = %016llx\n", offset, val);
+                pr_debug("%s:%s:%d offset %x = %016llx\n",
+                         skdev->name, __func__, __LINE__, offset, val);
         }
 }
 
@@ -764,15 +750,17 @@ static void skd_request_fn(struct request_queue *q)
                         if (io_flags & REQ_FUA)
                                 fua++;
 
-                        VPRINTK(skdev,
-                                "new req=%p lba=%u(0x%x) count=%u(0x%x) dir=%d\n",
-                                req, lba, lba, count, count, data_dir);
+                        pr_debug("%s:%s:%d new req=%p lba=%u(0x%x) "
+                                 "count=%u(0x%x) dir=%d\n",
+                                 skdev->name, __func__, __LINE__,
+                                 req, lba, lba, count, count, data_dir);
                 } else {
                         if (!list_empty(&skdev->flush_list)) {
                                 /* Process data part of FLUSH request. */
                                 bio = (struct bio *)skd_flush_cmd_dequeue(skdev);
                                 flush++;
-                                VPRINTK(skdev, "processing FLUSH request with data.\n");
+                                pr_debug("%s:%s:%d processing FLUSH request with data.\n",
+                                         skdev->name, __func__, __LINE__);
                         } else {
                                 /* peek at our bio queue */
                                 bio = bio_list_peek(&skdev->bio_queue);
@@ -787,9 +775,10 @@ static void skd_request_fn(struct request_queue *q)
                         data_dir = bio_data_dir(bio);
                         io_flags = bio->bi_rw;
 
-                        VPRINTK(skdev,
-                                "new bio=%p lba=%u(0x%x) count=%u(0x%x) dir=%d\n",
-                                bio, lba, lba, count, count, data_dir);
+                        pr_debug("%s:%s:%d new bio=%p lba=%u(0x%x) "
+                                 "count=%u(0x%x) dir=%d\n",
+                                 skdev->name, __func__, __LINE__,
+                                 bio, lba, lba, count, count, data_dir);
 
                         if (io_flags & REQ_FLUSH)
                                 flush++;
@@ -805,15 +794,17 @@ static void skd_request_fn(struct request_queue *q)
 
                 /* Are too many requets already in progress? */
                 if (skdev->in_flight >= skdev->cur_max_queue_depth) {
-                        VPRINTK(skdev, "qdepth %d, limit %d\n",
-                                skdev->in_flight, skdev->cur_max_queue_depth);
+                        pr_debug("%s:%s:%d qdepth %d, limit %d\n",
+                                 skdev->name, __func__, __LINE__,
+                                 skdev->in_flight, skdev->cur_max_queue_depth);
                         break;
                 }
 
                 /* Is a skd_request_context available? */
                 skreq = skdev->skreq_free_list;
                 if (skreq == NULL) {
-                        VPRINTK(skdev, "Out of req=%p\n", q);
+                        pr_debug("%s:%s:%d Out of req=%p\n",
+                                 skdev->name, __func__, __LINE__, q);
                         break;
                 }
                 SKD_ASSERT(skreq->state == SKD_REQ_STATE_IDLE);
@@ -822,7 +813,8 @@ static void skd_request_fn(struct request_queue *q)
                 /* Now we check to see if we can get a fit msg */
                 if (skmsg == NULL) {
                         if (skdev->skmsg_free_list == NULL) {
-                                VPRINTK(skdev, "Out of msg\n");
+                                pr_debug("%s:%s:%d Out of msg\n",
+                                         skdev->name, __func__, __LINE__);
                                 break;
                         }
                 }
@@ -862,7 +854,9 @@ static void skd_request_fn(struct request_queue *q)
                         /* Are there any FIT msg buffers available? */
                         skmsg = skdev->skmsg_free_list;
                         if (skmsg == NULL) {
-                                VPRINTK(skdev, "Out of msg skdev=%p\n", skdev);
+                                pr_debug("%s:%s:%d Out of msg skdev=%p\n",
+                                         skdev->name, __func__, __LINE__,
+                                         skdev);
                                 break;
                         }
                         SKD_ASSERT(skmsg->state == SKD_MSG_STATE_IDLE);
@@ -945,7 +939,8 @@ static void skd_request_fn(struct request_queue *q)
                          * only resource that has been allocated but might
                          * not be used is that the FIT msg could be empty.
                          */
-                        DPRINTK(skdev, "error Out\n");
+                        pr_debug("%s:%s:%d error Out\n",
+                                 skdev->name, __func__, __LINE__);
                         skd_end_request(skdev, skreq, error);
                         continue;
                 }
@@ -970,8 +965,9 @@ skip_sg:
                 timo_slot = skreq->timeout_stamp & SKD_TIMEOUT_SLOT_MASK;
                 skdev->timeout_slot[timo_slot]++;
                 skdev->in_flight++;
-                VPRINTK(skdev, "req=0x%x busy=%d\n",
-                        skreq->id, skdev->in_flight);
+                pr_debug("%s:%s:%d req=0x%x busy=%d\n",
+                         skdev->name, __func__, __LINE__,
+                         skreq->id, skdev->in_flight);