aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:20:56 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:20:56 -0500
commit5e7f3a46690f7f6c9f2781c700ab4370874aa0e8 (patch)
treebe5a50962416bbbc323c24d997ceb3472e3d44b9 /drivers/ide/ide-iops.c
parenta32296f93821497d794ab8e1312d677717479777 (diff)
ide: dynamic allocation of device structures
Allocate device structures dynamically instead of having them embedded in ide_hwif_t: * Remove needless zeroing of port structure from ide_init_port_data(). * Add ide_hwif_t.devices[MAX_DRIVES] (table of pointers to the devices). * Add ide_port_{alloc,free}_devices() helpers and use them respectively in ide_{host,free}_alloc(). * Convert all users of ->drives[] to use ->devices[] instead. While at it: * Use drive->dn for the slave device check in scc_pata.c. As a nice side-effect this patch cuts ~1kB (x86-32) from the resulting code size: text data bss dec hex filename 53963 1244 237 55444 d894 drivers/ide/ide-core.o.before 52981 1244 237 54462 d4be drivers/ide/ide-core.o.after Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 1bcb9484f49e..26b58d15c4e6 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1111,7 +1111,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
1111 prepare_to_wait(&ide_park_wq, &wait, TASK_UNINTERRUPTIBLE); 1111 prepare_to_wait(&ide_park_wq, &wait, TASK_UNINTERRUPTIBLE);
1112 timeout = jiffies; 1112 timeout = jiffies;
1113 for (unit = 0; unit < MAX_DRIVES; unit++) { 1113 for (unit = 0; unit < MAX_DRIVES; unit++) {
1114 ide_drive_t *tdrive = &hwif->drives[unit]; 1114 ide_drive_t *tdrive = hwif->devices[unit];
1115 1115
1116 if (tdrive->dev_flags & IDE_DFLAG_PRESENT && 1116 if (tdrive->dev_flags & IDE_DFLAG_PRESENT &&
1117 tdrive->dev_flags & IDE_DFLAG_PARKED && 1117 tdrive->dev_flags & IDE_DFLAG_PARKED &&
@@ -1134,7 +1134,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
1134 * for any of the drives on this interface. 1134 * for any of the drives on this interface.
1135 */ 1135 */
1136 for (unit = 0; unit < MAX_DRIVES; ++unit) 1136 for (unit = 0; unit < MAX_DRIVES; ++unit)
1137 pre_reset(&hwif->drives[unit]); 1137 pre_reset(hwif->devices[unit]);
1138 1138
1139 if (io_ports->ctl_addr == 0) { 1139 if (io_ports->ctl_addr == 0) {
1140 spin_unlock_irqrestore(&hwif->lock, flags); 1140 spin_unlock_irqrestore(&hwif->lock, flags);