libata: make ata_pci_init_one() not use ops->irq_handler and pi->sht

ata_pci_init_one() is the only function which uses ops->irq_handler
and pi->sht.  Other initialization functions take the same information
as arguments.  This causes confusion and duplicate unused entries in
structures.

Make ata_pci_init_one() take sht as an argument and use ata_interrupt
implicitly.  All current users use ata_interrupt and if different irq
handler is necessary open coding ata_pci_init_one() using
ata_prepare_sff_host() and ata_activate_sff_host can be done under ten
lines including error handling and driver which requires custom
interrupt handler is likely to require custom initialization anyway.

As ata_pci_init_one() was the last user of ops->irq_handler, this
patch also kills the field.

Signed-off-by: Tejun Heo <htejun@gmail.com>

1 files changed, 1 insertions, 11 deletions

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index b0cb4eaf273c..644702cac6ee 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -413,7 +413,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         static const struct ata_port_info info[10] = {
                 {       /* 0: AMD 7401 */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,     /* No SWDMA */
@@ -421,7 +420,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd33_port_ops
                 },
                 {       /* 1: Early AMD7409 - no swdma */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -429,7 +427,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd66_port_ops
                 },
                 {       /* 2: AMD 7409, no swdma errata */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -437,7 +434,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd66_port_ops
                 },
                 {       /* 3: AMD 7411 */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -445,7 +441,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd100_port_ops
                 },
                 {       /* 4: AMD 7441 */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -453,7 +448,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd100_port_ops
                 },
                 {       /* 5: AMD 8111*/
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -461,7 +455,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd133_port_ops
                 },
                 {       /* 6: AMD 8111 UDMA 100 (Serenade) */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -469,7 +462,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &amd133_port_ops
                 },
                 {       /* 7: Nvidia Nforce */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -477,7 +469,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &nv100_port_ops
                 },
                 {       /* 8: Nvidia Nforce2 and later */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -485,7 +476,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         .port_ops = &nv133_port_ops
                 },
                 {       /* 9: AMD CS5536 (Geode companion) */
-                        .sht = &amd_sht,
                         .flags = ATA_FLAG_SLAVE_POSS,
                         .pio_mask = 0x1f,
                         .mwdma_mask = 0x07,
@@ -544,7 +534,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* And fire it up */
-        return ata_pci_init_one(pdev, ppi);
+        return ata_pci_init_one(pdev, ppi, &amd_sht);
 }
 
 #ifdef CONFIG_PM