ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones

[ Upstream commit 93c7711494f47f9c829321e2a8711671b02f6e4c ]

Drop pointless VPRINTK() calls for entering and existing interrupt
routines and convert the remaining calls to dev_dbg().

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Stable-dep-of: 737dd811a3db ("ata: libahci: clear pending interrupt status")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 0905c07b8c7eb2a690e37f48ef146a771257a1f7..70930eb1e3286c7810d679531e806b35bcf6abe3 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -670,7 +670,7 @@ static void ahci_pci_init_controller(struct ata_host *host)
 
                /* clear port IRQ */
                tmp = readl(port_mmio + PORT_IRQ_STAT);
-               VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);
+               dev_dbg(&pdev->dev, "PORT_IRQ_STAT 0x%x\n", tmp);
                if (tmp)
                        writel(tmp, port_mmio + PORT_IRQ_STAT);
        }
@@ -1480,7 +1480,6 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)
        u32 irq_stat, irq_masked;
        unsigned int handled = 1;
 
-       VPRINTK("ENTER\n");
        hpriv = host->private_data;
        mmio = hpriv->mmio;
        irq_stat = readl(mmio + HOST_IRQ_STAT);
@@ -1497,7 +1496,6 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)
                irq_stat = readl(mmio + HOST_IRQ_STAT);
                spin_unlock(&host->lock);
        } while (irq_stat);
-       VPRINTK("EXIT\n");
 
        return IRQ_RETVAL(handled);
 }

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index ad58da7c9affd8e4ec381d8bb0fd7f23d6fa0310..06826ec47454fb233c576972960bada48d940718 100644 (file)
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -601,8 +601,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)
        void __iomem *mmio;
        u32 irq_stat, irq_masked;
 
-       VPRINTK("ENTER\n");
-
        hpriv = host->private_data;
        mmio = hpriv->mmio;
 
@@ -625,8 +623,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)
 
        spin_unlock(&host->lock);
 
-       VPRINTK("EXIT\n");
-
        return IRQ_RETVAL(rc);
 }
 

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 1fe18a4983f0d96c429124ff1e0e859f17bf3b46..3111c649816a2ddb28b91127be48c71380da1385 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1212,12 +1212,12 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
 
        /* clear SError */
        tmp = readl(port_mmio + PORT_SCR_ERR);
-       VPRINTK("PORT_SCR_ERR 0x%x\n", tmp);
+       dev_dbg(dev, "PORT_SCR_ERR 0x%x\n", tmp);
        writel(tmp, port_mmio + PORT_SCR_ERR);
 
        /* clear port IRQ */
        tmp = readl(port_mmio + PORT_IRQ_STAT);
-       VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);
+       dev_dbg(dev, "PORT_IRQ_STAT 0x%x\n", tmp);
        if (tmp)
                writel(tmp, port_mmio + PORT_IRQ_STAT);
 
@@ -1248,10 +1248,10 @@ void ahci_init_controller(struct ata_host *host)
        }
 
        tmp = readl(mmio + HOST_CTL);
-       VPRINTK("HOST_CTL 0x%x\n", tmp);
+       dev_dbg(host->dev, "HOST_CTL 0x%x\n", tmp);
        writel(tmp | HOST_IRQ_EN, mmio + HOST_CTL);
        tmp = readl(mmio + HOST_CTL);
-       VPRINTK("HOST_CTL 0x%x\n", tmp);
+       dev_dbg(host->dev, "HOST_CTL 0x%x\n", tmp);
 }
 EXPORT_SYMBOL_GPL(ahci_init_controller);
 
@@ -1902,8 +1902,6 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance)
        void __iomem *port_mmio = ahci_port_base(ap);
        u32 status;
 
-       VPRINTK("ENTER\n");
-
        status = readl(port_mmio + PORT_IRQ_STAT);
        writel(status, port_mmio + PORT_IRQ_STAT);
 
@@ -1911,8 +1909,6 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance)
        ahci_handle_port_interrupt(ap, port_mmio, status);
        spin_unlock(ap->lock);
 
-       VPRINTK("EXIT\n");
-
        return IRQ_HANDLED;
 }
 
@@ -1929,9 +1925,7 @@ u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked)
                ap = host->ports[i];
                if (ap) {
                        ahci_port_intr(ap);
-                       VPRINTK("port %u\n", i);
                } else {
-                       VPRINTK("port %u (no irq)\n", i);
                        if (ata_ratelimit())
                                dev_warn(host->dev,
                                         "interrupt on disabled port %u\n", i);
@@ -1952,8 +1946,6 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
        void __iomem *mmio;
        u32 irq_stat, irq_masked;
 
-       VPRINTK("ENTER\n");
-
        hpriv = host->private_data;
        mmio = hpriv->mmio;
 
@@ -1981,8 +1973,6 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
 
        spin_unlock(&host->lock);
 
-       VPRINTK("EXIT\n");
-
        return IRQ_RETVAL(rc);
 }