au1xxx-ide: au_ide_probe() fixes

* hwif->hold is always set in au_ide_probe() (few lines earlier),
  no need to set it again

* hwif->{channel,select_data,config_data} should be always zero

* autotune PIO also if CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is defined

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 27abff6f6ba2..e1f5356f91e0 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -677,15 +677,14 @@ static int au_ide_probe(struct device *dev)
         hwif->dma_setup                 = &auide_dma_setup;
         hwif->ide_dma_test_irq          = &auide_dma_test_irq;
         hwif->dma_lost_irq              = &auide_dma_lost_irq;
-#else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
+#endif
         hwif->channel                   = 0;
-        hwif->hold                      = 1;
         hwif->select_data               = 0;    /* no chipset-specific code */
         hwif->config_data               = 0;    /* no chipset-specific code */
 
         hwif->drives[0].autotune        = 1;    /* 1=autotune, 2=noautotune, 0=default */
         hwif->drives[1].autotune        = 1;
-#endif
+
         hwif->drives[0].no_io_32bit     = 1;
         hwif->drives[1].no_io_32bit     = 1;