Merge tag 'ovl-fixes-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-microblaze.git] / drivers / ata / sata_qstor.c

diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index ef00ab6..8ca0810 100644 (file)
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -252,9 +252,6 @@ static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
                len = sg_dma_len(sg);
                *(__le32 *)prd = cpu_to_le32(len);
                prd += sizeof(u64);
-
-               VPRINTK("PRD[%u] = (0x%llX, 0x%X)\n", si,
-                                       (unsigned long long)addr, len);
        }
 
        return si;
@@ -268,8 +265,6 @@ static enum ata_completion_errors qs_qc_prep(struct ata_queued_cmd *qc)
        u64 addr;
        unsigned int nelem;
 
-       VPRINTK("ENTER\n");
-
        qs_enter_reg_mode(qc->ap);
        if (qc->tf.protocol != ATA_PROT_DMA)
                return AC_ERR_OK;
@@ -304,8 +299,6 @@ static inline void qs_packet_start(struct ata_queued_cmd *qc)
        struct ata_port *ap = qc->ap;
        u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000);
 
-       VPRINTK("ENTER, ap %p\n", ap);
-
        writeb(QS_CTR0_CLER, chan + QS_CCT_CTR0);
        wmb();                             /* flush PRDs and pkt to memory */
        writel(QS_CCF_RUN_PKT, chan + QS_CCT_CFF);
@@ -374,8 +367,8 @@ static inline unsigned int qs_intr_pkt(struct ata_host *host)
                        struct qs_port_priv *pp = ap->private_data;
                        struct ata_queued_cmd *qc;
 
-                       DPRINTK("SFF=%08x%08x: sCHAN=%u sHST=%d sDST=%02x\n",
-                                       sff1, sff0, port_no, sHST, sDST);
+                       dev_dbg(host->dev, "SFF=%08x%08x: sHST=%d sDST=%02x\n",
+                               sff1, sff0, sHST, sDST);
                        handled = 1;
                        if (!pp || pp->state != qs_state_pkt)
                                continue;
@@ -435,14 +428,10 @@ static irqreturn_t qs_intr(int irq, void *dev_instance)
        unsigned int handled = 0;
        unsigned long flags;
 
-       VPRINTK("ENTER\n");
-
        spin_lock_irqsave(&host->lock, flags);
        handled  = qs_intr_pkt(host) | qs_intr_mmio(host);
        spin_unlock_irqrestore(&host->lock, flags);
 
-       VPRINTK("EXIT\n");
-
        return IRQ_RETVAL(handled);
 }