diff options
| author |   Tejun Heo <tj@kernel.org> | 2010-05-19 22:10:21 +0200 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2010-05-25 19:40:24 -0400 |
| commit | c3b2889424c26f3b42962b6f39aabb4f1fd1b576 (patch) | |
| tree | c131d260c18815cb84331357db75c17dabf083d8 /drivers/ata/sata_sis.c | |
| parent | libata-sff: ata_sff_irq_clear() is BMDMA specific (diff) | |
| download | linux-dev-c3b2889424c26f3b42962b6f39aabb4f1fd1b576.tar.xz linux-dev-c3b2889424c26f3b42962b6f39aabb4f1fd1b576.zip | |
libata-sff: separate out BMDMA irq handler
Separate out BMDMA irq handler from SFF irq handler. The misnamed
host_intr() functions are renamed to ata_sff_port_intr() and
ata_bmdma_port_intr(). Common parts are factored into
__ata_sff_port_intr() and __ata_sff_interrupt() and used by sff and
bmdma interrupt routines.
All BMDMA drivers now use ata_bmdma_interrupt() or
ata_bmdma_port_intr() while all non-BMDMA SFF ones use
ata_sff_interrupt() or ata_sff_port_intr().
For now, ata_pci_sff_init_one() uses ata_bmdma_interrupt() as it's
used by both SFF and BMDMA drivers.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/sata_sis.c')
| -rw-r--r-- | drivers/ata/sata_sis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index f8a91bfd66a8..fff10458a1aa 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c @@ -308,7 +308,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); pci_intx(pdev, 1); - return ata_host_activate(host, pdev->irq, ata_sff_interrupt, + return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt, IRQF_SHARED, &sis_sht); } |