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

Commit 256c5f8e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: fix hwif-s initialization 



* Add ide_hwifs[] entry initialization to ide_find_port_slot()
  and remove ide_init_port_data() calls from host drivers.

* Unexport ide_init_port_data().

* Remove no longer needed init_ide_data().

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

drivers/ide/arm/palm_bk3710.c

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 


	i = hwif->index;



	ide_init_port_data(hwif, i);

	ide_init_port_hw(hwif, &hw);



	default_hwif_mmiops(hwif);

drivers/ide/h8300/ide-h8300.c

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static int __init h8300_ide_init(void) 
	}



	index = hwif->index;

	ide_init_port_data(hwif, index);

	ide_init_port_hw(hwif, &hw);

	hwif_setup(hwif);

	hwif->host_flags = IDE_HFLAG_NO_IO_32BIT;

drivers/ide/ide-pnp.c

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
		u8 index = hwif->index;

		u8 idx[4] = { index, 0xff, 0xff, 0xff };



		ide_init_port_data(hwif, index);

		ide_init_port_hw(hwif, &hw);



		printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);

drivers/ide/ide-probe.c

+7 −3
Original line number Diff line number Diff line
@@ -1473,22 +1473,26 @@ ide_hwif_t *ide_find_port_slot(const struct ide_port_info *d) 
		for (; i < MAX_HWIFS; i++) {

			hwif = &ide_hwifs[i];

			if (hwif->chipset == ide_unknown)

				return hwif;

				goto out_found;

		}

	} else {

		for (i = 2; i < MAX_HWIFS; i++) {

			hwif = &ide_hwifs[i];

			if (hwif->chipset == ide_unknown)

				return hwif;

				goto out_found;

		}

		for (i = 0; i < 2 && i < MAX_HWIFS; i++) {

			hwif = &ide_hwifs[i];

			if (hwif->chipset == ide_unknown)

				return hwif;

				goto out_found;

		}

	}



	return NULL;



out_found:

	ide_init_port_data(hwif, i);

	return hwif;

}

EXPORT_SYMBOL_GPL(ide_find_port_slot);

drivers/ide/ide.c

+0 −15
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ void ide_init_port_data(ide_hwif_t *hwif, unsigned int index) 


	ide_port_init_devices_data(hwif);

}

EXPORT_SYMBOL_GPL(ide_init_port_data);



static void ide_port_init_devices_data(ide_hwif_t *hwif)

{
@@ -150,18 +149,6 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif) 
	}

}



static void __init init_ide_data (void)

{

	unsigned int index;



	/* Initialise all interface structures */

	for (index = 0; index < MAX_HWIFS; ++index) {

		ide_hwif_t *hwif = &ide_hwifs[index];



		ide_init_port_data(hwif, index);

	}

}



void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)

{

	ide_hwgroup_t *hwgroup = hwif->hwgroup;
@@ -1021,8 +1008,6 @@ static int __init ide_init(void) 
		goto out_port_class;

	}



	init_ide_data();



	proc_ide_create();



	return 0;