aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-09-29 12:26:00 -0400
committerTejun Heo <tj@kernel.org>2014-10-06 11:43:35 -0400
commit5ee1cfd975518bc9cdcd79e0b76552b5ae5c8c1e (patch)
tree9ffb84128351e869718fbd237305bcbd4828fe49 /drivers/ata
parentd1028e2f95b75acab4f1046acae1b1ca7d7b2577 (diff)
AHCI: Make few function names more descriptive
Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org> Cc: linux-ide@vger.kernel.org
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libahci.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 0080551f6e33..48175e5bd001 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1789,7 +1789,7 @@ static void ahci_port_intr(struct ata_port *ap)
1789 ahci_handle_port_interrupt(ap, port_mmio, status); 1789 ahci_handle_port_interrupt(ap, port_mmio, status);
1790} 1790}
1791 1791
1792static irqreturn_t ahci_thread_fn(int irq, void *dev_instance) 1792static irqreturn_t ahci_port_thread_fn(int irq, void *dev_instance)
1793{ 1793{
1794 struct ata_port *ap = dev_instance; 1794 struct ata_port *ap = dev_instance;
1795 struct ahci_port_priv *pp = ap->private_data; 1795 struct ahci_port_priv *pp = ap->private_data;
@@ -1810,7 +1810,7 @@ static irqreturn_t ahci_thread_fn(int irq, void *dev_instance)
1810 return IRQ_HANDLED; 1810 return IRQ_HANDLED;
1811} 1811}
1812 1812
1813static void ahci_hw_port_interrupt(struct ata_port *ap) 1813static void ahci_update_intr_status(struct ata_port *ap)
1814{ 1814{
1815 void __iomem *port_mmio = ahci_port_base(ap); 1815 void __iomem *port_mmio = ahci_port_base(ap);
1816 struct ahci_port_priv *pp = ap->private_data; 1816 struct ahci_port_priv *pp = ap->private_data;
@@ -1822,7 +1822,7 @@ static void ahci_hw_port_interrupt(struct ata_port *ap)
1822 pp->intr_status |= status; 1822 pp->intr_status |= status;
1823} 1823}
1824 1824
1825static irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance) 1825static irqreturn_t ahci_multi_irqs_intr(int irq, void *dev_instance)
1826{ 1826{
1827 struct ata_port *ap_this = dev_instance; 1827 struct ata_port *ap_this = dev_instance;
1828 struct ahci_port_priv *pp = ap_this->private_data; 1828 struct ahci_port_priv *pp = ap_this->private_data;
@@ -1858,7 +1858,7 @@ static irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance)
1858 1858
1859 ap = host->ports[i]; 1859 ap = host->ports[i];
1860 if (ap) { 1860 if (ap) {
1861 ahci_hw_port_interrupt(ap); 1861 ahci_update_intr_status(ap);
1862 VPRINTK("port %u\n", i); 1862 VPRINTK("port %u\n", i);
1863 } else { 1863 } else {
1864 VPRINTK("port %u (no irq)\n", i); 1864 VPRINTK("port %u (no irq)\n", i);
@@ -1877,7 +1877,7 @@ static irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance)
1877 return IRQ_WAKE_THREAD; 1877 return IRQ_WAKE_THREAD;
1878} 1878}
1879 1879
1880static irqreturn_t ahci_interrupt(int irq, void *dev_instance) 1880static irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)
1881{ 1881{
1882 struct ata_host *host = dev_instance; 1882 struct ata_host *host = dev_instance;
1883 struct ahci_host_priv *hpriv; 1883 struct ahci_host_priv *hpriv;
@@ -2488,8 +2488,8 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, int irq,
2488 } 2488 }
2489 2489
2490 rc = devm_request_threaded_irq(host->dev, irq + i, 2490 rc = devm_request_threaded_irq(host->dev, irq + i,
2491 ahci_hw_interrupt, 2491 ahci_multi_irqs_intr,
2492 ahci_thread_fn, IRQF_SHARED, 2492 ahci_port_thread_fn, IRQF_SHARED,
2493 pp->irq_desc, host->ports[i]); 2493 pp->irq_desc, host->ports[i]);
2494 if (rc) 2494 if (rc)
2495 goto out_free_irqs; 2495 goto out_free_irqs;
@@ -2538,7 +2538,7 @@ int ahci_host_activate(struct ata_host *host, int irq,
2538 if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) 2538 if (hpriv->flags & AHCI_HFLAG_MULTI_MSI)
2539 rc = ahci_host_activate_multi_irqs(host, irq, sht); 2539 rc = ahci_host_activate_multi_irqs(host, irq, sht);
2540 else 2540 else
2541 rc = ata_host_activate(host, irq, ahci_interrupt, 2541 rc = ata_host_activate(host, irq, ahci_single_irq_intr,
2542 IRQF_SHARED, sht); 2542 IRQF_SHARED, sht);
2543 return rc; 2543 return rc;
2544} 2544}