diff options
| author | Alexander Gordeev | 2014-09-29 18:25:57 +0200 |
|---|---|---|
| committer | Tejun Heo | 2014-10-06 11:43:34 -0400 |
| commit | a6849b9fdbffd2492a848df942b39d23bd81ef27 (patch) | |
| tree | 097c784127a46ccf49d5ede7b9d6279c513906a8 | |
| parent | 36888e955c7c7ba8c66756fed60ac6e453fcbb5f (diff) | |
AHCI: Pass SCSI host template as arg to ahci_host_activate()
This update is a prerequisite for consolidation of
AHCI host activation code within ahci_host_activate()
function.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
| -rw-r--r-- | drivers/ata/ahci.c | 10 | ||||
| -rw-r--r-- | drivers/ata/ahci.h | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index f68a995ec3fd..fcda5b663030 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1230,8 +1230,7 @@ intx: * ahci_host_activate - start AHCI host, request IRQs and register it * @host: target ATA host * @irq: base IRQ number to request - * @irq_handler: irq_handler used when requesting IRQs - * @irq_flags: irq_flags used when requesting IRQs + * @sht: scsi_host_template to use when registering the host * * Similar to ata_host_activate, but requests IRQs according to AHCI-1.1 * when multiple MSIs were allocated. That is one MSI per port, starting @@ -1243,7 +1242,8 @@ intx: * RETURNS: * 0 on success, -errno otherwise. */ -int ahci_host_activate(struct ata_host *host, int irq) +int ahci_host_activate(struct ata_host *host, int irq, + struct scsi_host_template *sht) { int i, rc; @@ -1271,7 +1271,7 @@ int ahci_host_activate(struct ata_host *host, int irq) for (i = 0; i < host->n_ports; i++) ata_port_desc(host->ports[i], "irq %d", irq + i); - rc = ata_host_register(host, &ahci_sht); + rc = ata_host_register(host, sht); if (rc) goto out_free_all_irqs; @@ -1488,7 +1488,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) - return ahci_host_activate(host, pdev->irq); + return ahci_host_activate(host, pdev->irq, &ahci_sht); return ata_host_activate(host, pdev->irq, ahci_interrupt, IRQF_SHARED, &ahci_sht); diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index a074c7301504..31b4c44e3f71 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -392,7 +392,8 @@ irqreturn_t ahci_interrupt(int irq, void *dev_instance); irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance); irqreturn_t ahci_thread_fn(int irq, void *dev_instance); void ahci_print_info(struct ata_host *host, const char *scc_s); -int ahci_host_activate(struct ata_host *host, int irq); +int ahci_host_activate(struct ata_host *host, int irq, + struct scsi_host_template *sht); void ahci_error_handler(struct ata_port *ap); static inline void __iomem *__ahci_port_base(struct ata_host *host, |