Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36b4cf8d authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Greg Kroah-Hartman
Browse files

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: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Stable-dep-of: 737dd811a3db ("ata: libahci: clear pending interrupt status")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a8140078

drivers/ata/ahci.c

+1 −3
Original line number Diff line number Diff line
@@ -694,7 +694,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);

	}
@@ -1504,7 +1504,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);
@@ -1521,7 +1520,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);

}

drivers/ata/ahci_xgene.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

}

drivers/ata/libahci.c

+4 −14
Original line number Diff line number Diff line
@@ -1226,12 +1226,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);
@@ -1262,10 +1262,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);
@@ -1916,8 +1916,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);
@@ -1925,8 +1923,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;

}
@@ -1943,9 +1939,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);
@@ -1966,8 +1960,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;
@@ -1995,8 +1987,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);

}