diff options
author | Tejun Heo <htejun@gmail.com> | 2008-03-24 23:22:49 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:17 -0400 |
commit | 1bd5b715a305f6f13455e89becbd839010dd14b5 (patch) | |
tree | 22e74b38495c51cda92145b7ae31f504f80d9fd3 /drivers/ata/pata_netcell.c | |
parent | 029cfd6b74fc5c517865fad78cf4a3ea8d9b664a (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_netcell.c')
-rw-r--r-- | drivers/ata/pata_netcell.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c index 65389d1837b3..ae50a5e85cf1 100644 --- a/drivers/ata/pata_netcell.c +++ b/drivers/ata/pata_netcell.c | |||
@@ -48,7 +48,6 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
48 | { | 48 | { |
49 | static int printed_version; | 49 | static int printed_version; |
50 | static const struct ata_port_info info = { | 50 | static const struct ata_port_info info = { |
51 | .sht = &netcell_sht, | ||
52 | .flags = ATA_FLAG_SLAVE_POSS, | 51 | .flags = ATA_FLAG_SLAVE_POSS, |
53 | /* Actually we don't really care about these as the | 52 | /* Actually we don't really care about these as the |
54 | firmware deals with it */ | 53 | firmware deals with it */ |
@@ -72,7 +71,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
72 | ata_pci_clear_simplex(pdev); | 71 | ata_pci_clear_simplex(pdev); |
73 | 72 | ||
74 | /* And let the library code do the work */ | 73 | /* And let the library code do the work */ |
75 | return ata_pci_init_one(pdev, port_info); | 74 | return ata_pci_init_one(pdev, port_info, &netcell_sht); |
76 | } | 75 | } |
77 | 76 | ||
78 | static const struct pci_device_id netcell_pci_tbl[] = { | 77 | static const struct pci_device_id netcell_pci_tbl[] = { |