Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94400092 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: move ide_arm_init() call from init_ide_data() to ide_init() 



* Remove ide_init_port_data() call from ide_arm_init() and move
  ide_arm_init() call from init_ide_data() to ide_init().

This patch is a preparation for the future changes (and as a side-effect
makes obsolete "idex=io[,ctl[,irq]]" kernel parameters work for ide_arm).

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent cbb010c1

drivers/ide/arm/ide_arm.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ void __init ide_arm_init(void) 


	hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);

	if (hwif) {

		ide_init_port_data(hwif, hwif->index);

		ide_init_port_hw(hwif, &hw);

	}

}

drivers/ide/ide.c

+3 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ static void __init init_ide_data (void) 
			ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);

#endif

	}

#ifdef CONFIG_IDE_ARM

	ide_arm_init();

#endif

}



/**
@@ -1774,6 +1771,9 @@ static int __init ide_init(void) 


	proc_ide_create();



#ifdef CONFIG_IDE_ARM

	ide_arm_init();

#endif

#ifdef CONFIG_BLK_DEV_ALI14XX

	if (probe_ali14xx)

		(void)ali14xx_init();