diff options
| author | Bartlomiej Zolnierkiewicz | 2007-10-20 00:32:31 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2007-10-20 00:32:31 +0200 |
| commit | 8447d9d52adbe4c653482bd0d5ccb9b5d26f9c9d (patch) | |
| tree | 358aa3ca6b0657623b84e7c6278f90fc95a32879 /drivers/ide/legacy/umc8672.c | |
| parent | ide: add ->fixup method to ide_hwif_t (diff) | |
| download | kernel-qcow2-linux-8447d9d52adbe4c653482bd0d5ccb9b5d26f9c9d.tar.gz kernel-qcow2-linux-8447d9d52adbe4c653482bd0d5ccb9b5d26f9c9d.tar.xz kernel-qcow2-linux-8447d9d52adbe4c653482bd0d5ccb9b5d26f9c9d.zip | |
ide: add ide_device_add()
* Add ide_device_add() helper and convert host drivers to use it
instead of open-coded variants.
* Make ide_pci_setup_ports() and do_ide_setup_pci_device()
take 'u8 *idx' argument instead of 'ata_index_t *index'.
* Remove no longer needed ata_index_t.
* Unexport probe_hwif_init() and make it static.
* Unexport ide_proc_register_port().
There should be no functionality changes caused by this patch
(sgiioc4.c: ide_proc_register_port() requires hwif->present
to be set and it won't be set if probe_hwif_init() fails).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy/umc8672.c')
| -rw-r--r-- | drivers/ide/legacy/umc8672.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c index 1151c92dd531..79577b916874 100644 --- a/drivers/ide/legacy/umc8672.c +++ b/drivers/ide/legacy/umc8672.c @@ -124,8 +124,9 @@ static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio) static int __init umc8672_probe(void) { - unsigned long flags; ide_hwif_t *hwif, *mate; + unsigned long flags; + static u8 idx[4] = { 0, 1, 0xff, 0xff }; if (!request_region(0x108, 2, "umc8672")) { printk(KERN_ERR "umc8672: ports 0x108-0x109 already in use.\n"); @@ -158,11 +159,7 @@ static int __init umc8672_probe(void) mate->mate = hwif; mate->channel = 1; - probe_hwif_init(hwif); - probe_hwif_init(mate); - - ide_proc_register_port(hwif); - ide_proc_register_port(mate); + ide_device_add(idx); return 0; } |