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

Commit 07eb106f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-pmac: add ->init_dev method (take 4) 



v2/3:
* Build fixes from Stephen Rothwell.

v4:
* Fix ->noprobe setting. (From Benjamin Herrenschmidt)

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7b8797ac

drivers/ide/ppc/pmac.c

+20 −11
Original line number Diff line number Diff line
@@ -941,7 +941,25 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif) 
	return ATA_CBL_PATA40;

}



static void pmac_ide_init_dev(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	pmac_ide_hwif_t *pmif =

		(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);



	if (pmif->mediabay) {

#ifdef CONFIG_PMAC_MEDIABAY

		if (check_media_bay_by_base(pmif->regbase, MB_CD) == 0) {

			drive->noprobe = 0;

			return;

		}

#endif

		drive->noprobe = 1;

	}

}



static const struct ide_port_ops pmac_ide_ata6_port_ops = {

	.init_dev		= pmac_ide_init_dev,

	.set_pio_mode		= pmac_ide_set_pio_mode,

	.set_dma_mode		= pmac_ide_set_dma_mode,

	.selectproc		= pmac_ide_kauai_selectproc,
@@ -949,6 +967,7 @@ static const struct ide_port_ops pmac_ide_ata6_port_ops = { 
};



static const struct ide_port_ops pmac_ide_ata4_port_ops = {

	.init_dev		= pmac_ide_init_dev,

	.set_pio_mode		= pmac_ide_set_pio_mode,

	.set_dma_mode		= pmac_ide_set_dma_mode,

	.selectproc		= pmac_ide_selectproc,
@@ -956,6 +975,7 @@ static const struct ide_port_ops pmac_ide_ata4_port_ops = { 
};



static const struct ide_port_ops pmac_ide_port_ops = {

	.init_dev		= pmac_ide_init_dev,

	.set_pio_mode		= pmac_ide_set_pio_mode,

	.set_dma_mode		= pmac_ide_set_dma_mode,

	.selectproc		= pmac_ide_selectproc,
@@ -1069,17 +1089,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) 
	       hwif->index, model_name[pmif->kind], pmif->aapl_bus_id,

	       pmif->mediabay ? " (mediabay)" : "", hwif->irq);



	if (pmif->mediabay) {

#ifdef CONFIG_PMAC_MEDIABAY

		if (check_media_bay_by_base(pmif->regbase, MB_CD)) {

#else

		if (1) {

#endif

			hwif->drives[0].noprobe = 1;

			hwif->drives[1].noprobe = 1;

		}

	}



	idx[0] = hwif->index;



	ide_device_add(idx, &d);