adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-04 07:03:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

ide: factor out devices init from ide_init_port_data()

Browse source 
* Factor out devices init from ide_init_port_data() to
  ide_port_init_devices_data().

While at it:

* Add explicit clearing of IDE device structure.

There should be no functionality changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-04-18 00:46:22 +02:00
parent 71bf9f6fe8
commit 43514ed1ee
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/ide/ide.c
View file

@ -105,13 +105,13 @@ ide_hwif_t ide_hwifs[MAX_HWIFS]; /* master data repository */
EXPORT_SYMBOL(ide_hwifs); EXPORT_SYMBOL(ide_hwifs);
static void ide_port_init_devices_data(ide_hwif_t *);
/* /*
* Do not even *think* about calling this! * Do not even *think* about calling this!
*/ */
void ide_init_port_data(ide_hwif_t *hwif, unsigned int index) void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
{ {
unsigned int unit;
/* bulk initialize hwif & drive info with zeros */ /* bulk initialize hwif & drive info with zeros */
memset(hwif, 0, sizeof(ide_hwif_t)); memset(hwif, 0, sizeof(ide_hwif_t));
@ -130,8 +130,20 @@ void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
default_hwif_iops(hwif); default_hwif_iops(hwif);
default_hwif_transport(hwif); default_hwif_transport(hwif);
ide_port_init_devices_data(hwif);
}
EXPORT_SYMBOL_GPL(ide_init_port_data);
static void ide_port_init_devices_data(ide_hwif_t *hwif)
{
int unit;
for (unit = 0; unit < MAX_DRIVES; ++unit) { for (unit = 0; unit < MAX_DRIVES; ++unit) {
ide_drive_t *drive = &hwif->drives[unit]; ide_drive_t *drive = &hwif->drives[unit];
u8 j = (hwif->index * MAX_DRIVES) + unit;
memset(drive, 0, sizeof(*drive));
drive->media = ide_disk; drive->media = ide_disk;
drive->select.all = (unit<<4)|0xa0; drive->select.all = (unit<<4)|0xa0;
@ -143,15 +155,14 @@ void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
drive->special.b.set_geometry = 1; drive->special.b.set_geometry = 1;
drive->name[0] = 'h'; drive->name[0] = 'h';
drive->name[1] = 'd'; drive->name[1] = 'd';
drive->name[2] = 'a' + (index * MAX_DRIVES) + unit; drive->name[2] = 'a' + j;
drive->max_failures = IDE_DEFAULT_MAX_FAILURES; drive->max_failures = IDE_DEFAULT_MAX_FAILURES;
drive->using_dma = 0;
drive->vdma = 0;
INIT_LIST_HEAD(&drive->list); INIT_LIST_HEAD(&drive->list);
init_completion(&drive->gendev_rel_comp); init_completion(&drive->gendev_rel_comp);
} }
} }
EXPORT_SYMBOL_GPL(ide_init_port_data);
static void init_hwif_default(ide_hwif_t *hwif, unsigned int index) static void init_hwif_default(ide_hwif_t *hwif, unsigned int index)
{ {