diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 21:31:09 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 21:31:09 +1100 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /drivers/ide/pci/hpt366.c | |
| parent | b9c64498f53e0f4d90eec03048f73ac215bb6f79 (diff) | |
| parent | da40451bba23b51eaca4170a095891646ce72104 (diff) | |
| download | op-kernel-dev-3cecdda3f169f22f324f78fd544beee68e3cc6a4.zip op-kernel-dev-3cecdda3f169f22f324f78fd544beee68e3cc6a4.tar.gz | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'drivers/ide/pci/hpt366.c')
| -rw-r--r-- | drivers/ide/pci/hpt366.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index d0f7bb8..6357bb6 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c @@ -1570,10 +1570,12 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic if (rev < 3) info = &hpt36x; else { - static const struct hpt_info *hpt37x_info[] = - { &hpt370, &hpt370a, &hpt372, &hpt372n }; - - info = hpt37x_info[min_t(u8, rev, 6) - 3]; + switch (min_t(u8, rev, 6)) { + case 3: info = &hpt370; break; + case 4: info = &hpt370a; break; + case 5: info = &hpt372; break; + case 6: info = &hpt372n; break; + } idx++; } break; @@ -1626,7 +1628,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic return ide_setup_pci_device(dev, &d); } -static const struct pci_device_id hpt366_pci_tbl[] = { +static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = { { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), 0 }, { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372), 1 }, { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302), 2 }, |
