[PATCH] IDE 21

If I was to give this patch a name it would be:

"Vojtech Pavlik unleashed from the chains".

So credit where credit is due :-).

Anyway here follows the change log:

Mon Mar 11 23:48:28 CET 2002 ide-clean-21

- Swallow rewritten amd74xx host chip setup code from Vojtech Pavlik.  We can
   revert it easly if it turns out to be a bad thing. However the code looks
   quite sane to me. In esp. it doesn't containg that many magic numbers.

- Clean stale white spaces in ide-timing.h tirvial fix.

- Make ide_release_dma return void. It's value is never used anyway.

- Swallow more timing setup code cleanup by Vojtech Pavlik. Apply some
   cosmetics to it. Port opti621 to the new setup code.

- Kill abuse of ide_do_reset() on error return paths for atapi floppy tape and
   cd-rom devices. Just stop them. This gives better changes that defect
   removable media will not cause suddenly broken timings on hard discs
   containing system data! Even then comments in ide_do_reset() admit, that
   resetting the whole channel can have adverse effects on the second interface
   on this channel. And I have too frequently observed linux struggling on
   defect cd-rom for a far too long time to wish it to continue.

   Oh did I forget to say that the corresponding "how can I break my system fast
   and reliable" ioctl is gone as well?

   Removing it recovered the fact that the CONFIG_BLK_DEV_IDEDMA_TIMEOUT is
   completely bogous. I have removed this option therefore as well, because it's
   playing the same wrack havoc on the devices if enabled. This cat has been in
   an unfinished and *unfunctional* state anyway.

- Actually add physical suspend code to the power handling code.  Still the
   resume code isn't finished just jet. This is all subject to change at the
   point in time when we get to proper command queueing.
   I think however that Pavel will be interrested in tidding this bit up...

- Resync with 2.5.7-pre1.

1 files changed, 1 insertions, 7 deletions

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 6fe678abd65f..aa3d9c39913f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -746,12 +746,6 @@ int ide_xlate_1024 (kdev_t, int, int, const char *);
 ide_drive_t *get_info_ptr (kdev_t i_rdev);
 
 /*
- * Start a reset operation for an IDE interface.
- * The caller should return immediately after invoking this.
- */
-ide_startstop_t ide_do_reset (ide_drive_t *);
-
-/*
  * Re-Start an operation for an IDE interface.
  * The caller should return immediately after invoking this.
  */
@@ -953,7 +947,7 @@ void ide_destroy_dmatable (ide_drive_t *drive);
 ide_startstop_t ide_dma_intr (ide_drive_t *drive);
 int check_drive_lists (ide_drive_t *drive, int good_bad);
 int ide_dmaproc (ide_dma_action_t func, ide_drive_t *drive);
-int ide_release_dma (ide_hwif_t *hwif);
+extern void ide_release_dma(ide_hwif_t *hwif);
 void ide_setup_dma (ide_hwif_t *hwif, unsigned long dmabase, unsigned int num_ports) __init;
 #endif