diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:24 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:24 -0500 |
commit | 7b77d864af29c193f6cee8338dbda40accb9b27b (patch) | |
tree | 920f8605b26f11d520264bb8ab6faf2bffc1d162 /drivers/ide/pci/cy82c693.c | |
parent | c1607e1af238b823a2158a18ff6c89144ce38c6c (diff) |
ide: remove ide_pci_device_t tables with only one entry
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
-rw-r--r-- | drivers/ide/pci/cy82c693.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 9eafcbf444f4..603a7bebf117 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
@@ -478,21 +478,18 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) | |||
478 | } | 478 | } |
479 | } | 479 | } |
480 | 480 | ||
481 | static ide_pci_device_t cy82c693_chipsets[] __devinitdata = { | 481 | static ide_pci_device_t cy82c693_chipset __devinitdata = { |
482 | { /* 0 */ | 482 | .name = "CY82C693", |
483 | .name = "CY82C693", | 483 | .init_chipset = init_chipset_cy82c693, |
484 | .init_chipset = init_chipset_cy82c693, | 484 | .init_iops = init_iops_cy82c693, |
485 | .init_iops = init_iops_cy82c693, | 485 | .init_hwif = init_hwif_cy82c693, |
486 | .init_hwif = init_hwif_cy82c693, | 486 | .channels = 1, |
487 | .channels = 1, | 487 | .autodma = AUTODMA, |
488 | .autodma = AUTODMA, | 488 | .bootable = ON_BOARD, |
489 | .bootable = ON_BOARD, | ||
490 | } | ||
491 | }; | 489 | }; |
492 | 490 | ||
493 | static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id) | 491 | static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id) |
494 | { | 492 | { |
495 | ide_pci_device_t *d = &cy82c693_chipsets[id->driver_data]; | ||
496 | struct pci_dev *dev2; | 493 | struct pci_dev *dev2; |
497 | int ret = -ENODEV; | 494 | int ret = -ENODEV; |
498 | 495 | ||
@@ -501,7 +498,7 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev | |||
501 | if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && | 498 | if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE && |
502 | PCI_FUNC(dev->devfn) == 1) { | 499 | PCI_FUNC(dev->devfn) == 1) { |
503 | dev2 = pci_get_slot(dev->bus, dev->devfn + 1); | 500 | dev2 = pci_get_slot(dev->bus, dev->devfn + 1); |
504 | ret = ide_setup_pci_devices(dev, dev2, d); | 501 | ret = ide_setup_pci_devices(dev, dev2, &cy82c693_chipset); |
505 | /* We leak pci refs here but thats ok - we can't be unloaded */ | 502 | /* We leak pci refs here but thats ok - we can't be unloaded */ |
506 | } | 503 | } |
507 | return ret; | 504 | return ret; |