Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a42bcc0f2fc380fac81a7ac525a70bbef44bb042
Commit:     a42bcc0f2fc380fac81a7ac525a70bbef44bb042
Parent:     ade2daf9c6e57845fe83a24e0a9fa1c03c6e91b1
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 26 20:13:07 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 20:13:07 2008 +0100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/mips/au1xxx-ide.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 27abff6..e1f5356 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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to