xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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>
This commit is contained in:
Hannes Reinecke
2021-12-21 08:20:47 +01:00
committed by Greg Kroah-Hartman
parent 407bf1c140
commit 11d15a115c
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ata/ahci.c
View File

@@ -703,7 +703,7 @@ static void ahci_pci_init_controller(struct ata_host *host)
/* clear port IRQ */ /* clear port IRQ */
tmp = readl(port_mmio + PORT_IRQ_STAT); 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) if (tmp)
writel(tmp, port_mmio + PORT_IRQ_STAT); writel(tmp, port_mmio + PORT_IRQ_STAT);
} }
@@ -1495,7 +1495,6 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)
u32 irq_stat, irq_masked; u32 irq_stat, irq_masked;
unsigned int handled = 1; unsigned int handled = 1;
VPRINTK("ENTER\n");
hpriv = host->private_data; hpriv = host->private_data;
mmio = hpriv->mmio; mmio = hpriv->mmio;
irq_stat = readl(mmio + HOST_IRQ_STAT); irq_stat = readl(mmio + HOST_IRQ_STAT);
@@ -1512,7 +1511,6 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)
irq_stat = readl(mmio + HOST_IRQ_STAT); irq_stat = readl(mmio + HOST_IRQ_STAT);
spin_unlock(&host->lock); spin_unlock(&host->lock);
} while (irq_stat); } while (irq_stat);
VPRINTK("EXIT\n");
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }

4
drivers/ata/ahci_xgene.c
View File

@@ -588,8 +588,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)
void __iomem *mmio; void __iomem *mmio;
u32 irq_stat, irq_masked; u32 irq_stat, irq_masked;
VPRINTK("ENTER\n");
hpriv = host->private_data; hpriv = host->private_data;
mmio = hpriv->mmio; mmio = hpriv->mmio;
@@ -612,8 +610,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)
spin_unlock(&host->lock); spin_unlock(&host->lock);
VPRINTK("EXIT\n");
return IRQ_RETVAL(rc); return IRQ_RETVAL(rc);
} }

18
drivers/ata/libahci.c
View File

@@ -1215,12 +1215,12 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
/* clear SError */ /* clear SError */
tmp = readl(port_mmio + PORT_SCR_ERR); 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); writel(tmp, port_mmio + PORT_SCR_ERR);
/* clear port IRQ */ /* clear port IRQ */
tmp = readl(port_mmio + PORT_IRQ_STAT); 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) if (tmp)
writel(tmp, port_mmio + PORT_IRQ_STAT); writel(tmp, port_mmio + PORT_IRQ_STAT);
@@ -1251,10 +1251,10 @@ void ahci_init_controller(struct ata_host *host)
} }
tmp = readl(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);
writel(tmp | HOST_IRQ_EN, mmio + HOST_CTL); writel(tmp | HOST_IRQ_EN, mmio + HOST_CTL);
tmp = readl(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); EXPORT_SYMBOL_GPL(ahci_init_controller);
@@ -1905,8 +1905,6 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance)
void __iomem *port_mmio = ahci_port_base(ap); void __iomem *port_mmio = ahci_port_base(ap);
u32 status; u32 status;
VPRINTK("ENTER\n");
status = readl(port_mmio + PORT_IRQ_STAT); status = readl(port_mmio + PORT_IRQ_STAT);
writel(status, port_mmio + PORT_IRQ_STAT); writel(status, port_mmio + PORT_IRQ_STAT);
@@ -1914,8 +1912,6 @@ static irqreturn_t ahci_multi_irqs_intr_hard(int irq, void *dev_instance)
ahci_handle_port_interrupt(ap, port_mmio, status); ahci_handle_port_interrupt(ap, port_mmio, status);
spin_unlock(ap->lock); spin_unlock(ap->lock);
VPRINTK("EXIT\n");
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@@ -1932,9 +1928,7 @@ u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked)
ap = host->ports[i]; ap = host->ports[i];
if (ap) { if (ap) {
ahci_port_intr(ap); ahci_port_intr(ap);
VPRINTK("port %u\n", i);
} else { } else {
VPRINTK("port %u (no irq)\n", i);
if (ata_ratelimit()) if (ata_ratelimit())
dev_warn(host->dev, dev_warn(host->dev,
"interrupt on disabled port %u\n", i); "interrupt on disabled port %u\n", i);
@@ -1955,8 +1949,6 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
void __iomem *mmio; void __iomem *mmio;
u32 irq_stat, irq_masked; u32 irq_stat, irq_masked;
VPRINTK("ENTER\n");
hpriv = host->private_data; hpriv = host->private_data;
mmio = hpriv->mmio; mmio = hpriv->mmio;
@@ -1984,8 +1976,6 @@ static irqreturn_t ahci_single_level_irq_intr(int irq, void *dev_instance)
spin_unlock(&host->lock); spin_unlock(&host->lock);
VPRINTK("EXIT\n");
return IRQ_RETVAL(rc); return IRQ_RETVAL(rc);
} }