aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_cmd640.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-03-24 23:22:49 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:17 -0400
commit1bd5b715a305f6f13455e89becbd839010dd14b5 (patch)
tree22e74b38495c51cda92145b7ae31f504f80d9fd3 /drivers/ata/pata_cmd640.c
parent029cfd6b74fc5c517865fad78cf4a3ea8d9b664a (diff)
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>
Diffstat (limited to 'drivers/ata/pata_cmd640.c')
-rw-r--r--drivers/ata/pata_cmd640.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 061c891c8a66..efd2bb5747b4 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -211,7 +211,6 @@ static void cmd640_hardware_init(struct pci_dev *pdev)
211static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 211static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
212{ 212{
213 static const struct ata_port_info info = { 213 static const struct ata_port_info info = {
214 .sht = &cmd640_sht,
215 .flags = ATA_FLAG_SLAVE_POSS, 214 .flags = ATA_FLAG_SLAVE_POSS,
216 .pio_mask = 0x1f, 215 .pio_mask = 0x1f,
217 .port_ops = &cmd640_port_ops 216 .port_ops = &cmd640_port_ops
@@ -225,7 +224,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
225 224
226 cmd640_hardware_init(pdev); 225 cmd640_hardware_init(pdev);
227 226
228 return ata_pci_init_one(pdev, ppi); 227 return ata_pci_init_one(pdev, ppi, &cmd640_sht);
229} 228}
230 229
231#ifdef CONFIG_PM 230#ifdef CONFIG_PM