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

Commit 761052e6 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ->INB, ->OUTB and ->OUTBSYNC methods 



* Remove no longer needed ->INB, ->OUTB and ->OUTBSYNC methods.

Then:

* Remove no longer used default_hwif_[mm]iops() and ide_[mm_]outbsync().

* Cleanup SuperIO handling in ns87415.c.

There should be no functional changes caused by this patch.

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

drivers/ide/arm/icside.c

+0 −5
Original line number Diff line number Diff line
@@ -469,8 +469,6 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) 
	if (!hwif)

		return -ENODEV;



	default_hwif_mmiops(hwif);



	state->hwif[0] = hwif;



	ecard_set_drvdata(ec, state);
@@ -547,14 +545,11 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 
		return -ENODEV;



	hwif->chipset = ide_acorn;

	default_hwif_mmiops(hwif);



	idx[0] = hwif->index;



	mate = ide_find_port();

	if (mate) {

		default_hwif_mmiops(mate);



		hws[1] = &hw[1];

		idx[1] = mate->index;

	}

drivers/ide/arm/palm_bk3710.c

+0 −2
Original line number Diff line number Diff line
@@ -399,8 +399,6 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 


	i = hwif->index;



	default_hwif_mmiops(hwif);



	idx[0] = i;



	ide_device_add(idx, &palm_bk3710_port_info, hws);

drivers/ide/arm/rapide.c

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) 
		goto release;

	}



	default_hwif_mmiops(hwif);



	idx[0] = hwif->index;



	ide_device_add(idx, &rapide_port_info, hws);

drivers/ide/h8300/ide-h8300.c

+0 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ static inline void hw_setup(hw_regs_t *hw) 


static inline void hwif_setup(ide_hwif_t *hwif)

{

	default_hwif_iops(hwif);



	hwif->tf_load = h8300_tf_load;

	hwif->tf_read = h8300_tf_read;

drivers/ide/ide-iops.c

+0 −28
Original line number Diff line number Diff line
@@ -42,18 +42,6 @@ static void ide_outb (u8 val, unsigned long port) 
	outb(val, port);

}



static void ide_outbsync(ide_hwif_t *hwif, u8 addr, unsigned long port)

{

	outb(addr, port);

}



void default_hwif_iops (ide_hwif_t *hwif)

{

	hwif->OUTB	= ide_outb;

	hwif->OUTBSYNC	= ide_outbsync;

	hwif->INB	= ide_inb;

}



/*

 *	MMIO operations, typically used for SATA controllers

 */
@@ -68,22 +56,6 @@ static void ide_mm_outb (u8 value, unsigned long port) 
	writeb(value, (void __iomem *) port);

}



static void ide_mm_outbsync(ide_hwif_t *hwif, u8 value, unsigned long port)

{

	writeb(value, (void __iomem *) port);

}



void default_hwif_mmiops (ide_hwif_t *hwif)

{

	hwif->OUTB	= ide_mm_outb;

	/* Most systems will need to override OUTBSYNC, alas however

	   this one is controller specific! */

	hwif->OUTBSYNC	= ide_mm_outbsync;

	hwif->INB	= ide_mm_inb;

}



EXPORT_SYMBOL(default_hwif_mmiops);



void SELECT_DRIVE (ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;