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

Commit 4ee06b7e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove stale ide.h "configuration options" 



Remove stale ide.h "configuration options":

* INITIAL_MULT_COUNT - always defined to 0

* SUPPORT_SLOW_DATA_PORTS - unused

* OK_TO_RESET_CONTROLLER - always defined to 1

* DISABLE_IRQ_NOSYNC - always defined to 0

Leave SUPPORT_VLB_SYNC (defined to 0 for CRIS and FRV, otherwise to 1)
for now but disallow overriding it by <asm/ide.h>.

There should be no functionality changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f1ca6d37

drivers/ide/ide-io.c

+0 −4
Original line number Diff line number Diff line
@@ -1469,12 +1469,8 @@ void ide_timer_expiry (unsigned long data) 
			 */

			spin_unlock(&ide_lock);

			hwif  = HWIF(drive);

#if DISABLE_IRQ_NOSYNC

			disable_irq_nosync(hwif->irq);

#else

			/* disable_irq_nosync ?? */

			disable_irq(hwif->irq);

#endif /* DISABLE_IRQ_NOSYNC */

			/* local CPU only,

			 * as if we were handling an interrupt */

			local_irq_disable();

drivers/ide/ide-iops.c

+2 −7
Original line number Diff line number Diff line
@@ -1050,7 +1050,6 @@ static void ide_disk_pre_reset(ide_drive_t *drive) 
	drive->special.all = 0;

	drive->special.b.set_geometry = legacy;

	drive->special.b.recalibrate  = legacy;

	if (OK_TO_RESET_CONTROLLER)

	drive->mult_count = 0;

	if (!drive->keep_settings && !drive->using_dma)

		drive->mult_req = 0;
@@ -1136,7 +1135,6 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi) 
	for (unit = 0; unit < MAX_DRIVES; ++unit)

		pre_reset(&hwif->drives[unit]);



#if OK_TO_RESET_CONTROLLER

	if (!IDE_CONTROL_REG) {

		spin_unlock_irqrestore(&ide_lock, flags);

		return ide_stopped;
@@ -1173,11 +1171,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi) 
	 * state when the disks are reset this way. At least, the Winbond

	 * 553 documentation says that

	 */

	if (hwif->resetproc != NULL) {

	if (hwif->resetproc)

		hwif->resetproc(drive);

	}

	

#endif	/* OK_TO_RESET_CONTROLLER */



	spin_unlock_irqrestore(&ide_lock, flags);

	return ide_started;

drivers/ide/ide-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ static void ide_disk_init_mult_count(ide_drive_t *drive) 
#ifdef CONFIG_IDEDISK_MULTI_MODE

		id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0;

		id->multsect_valid = id->multsect ? 1 : 0;

		drive->mult_req = id->multsect_valid ? id->max_multsect : INITIAL_MULT_COUNT;

		drive->mult_req = id->multsect_valid ? id->max_multsect : 0;

		drive->special.b.set_multmode = drive->mult_req ? 1 : 0;

#else	/* original, pre IDE-NFG, per request of AC */

		drive->mult_req = INITIAL_MULT_COUNT;

		drive->mult_req = 0;

		if (drive->mult_req > id->max_multsect)

			drive->mult_req = id->max_multsect;

		if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect))

include/asm-cris/arch-v10/ide.h

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ static inline void ide_init_default_hwifs(void) 
	}

}



/* some configuration options we don't need */



#undef SUPPORT_VLB_SYNC

#define SUPPORT_VLB_SYNC 0



#endif /* __KERNEL__ */



#endif /* __ASMCRIS_IDE_H */

include/asm-cris/arch-v32/ide.h

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ static inline unsigned long ide_default_io_base(int index) 
	return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2);

}



/* some configuration options we don't need */



#undef SUPPORT_VLB_SYNC

#define SUPPORT_VLB_SYNC 0



#define IDE_ARCH_ACK_INTR

#define ide_ack_intr(hwif)	((hwif)->ack_intr(hwif))