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>
This commit is contained in:
@@ -861,7 +861,7 @@ static void probe_hwif(ide_hwif_t *hwif)
|
||||
static int hwif_init(ide_hwif_t *hwif);
|
||||
static void hwif_register_devices(ide_hwif_t *hwif);
|
||||
|
||||
int probe_hwif_init(ide_hwif_t *hwif)
|
||||
static int probe_hwif_init(ide_hwif_t *hwif)
|
||||
{
|
||||
probe_hwif(hwif);
|
||||
|
||||
@@ -877,8 +877,6 @@ int probe_hwif_init(ide_hwif_t *hwif)
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(probe_hwif_init);
|
||||
|
||||
#if MAX_HWIFS > 1
|
||||
/*
|
||||
* save_match() is used to simplify logic in init_irq() below.
|
||||
@@ -1410,3 +1408,22 @@ int ideprobe_init (void)
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(ideprobe_init);
|
||||
|
||||
int ide_device_add(u8 idx[4])
|
||||
{
|
||||
int i, rc = 0;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (idx[i] != 0xff)
|
||||
rc |= probe_hwif_init(&ide_hwifs[idx[i]]);
|
||||
}
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (idx[i] != 0xff)
|
||||
ide_proc_register_port(&ide_hwifs[idx[i]]);
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(ide_device_add);
|
||||
|
Reference in New Issue
Block a user