Merge tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / ide / tx4939ide.c

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 67d4a7d4acc8ae5adeabebe8c971fe870b0ba941..88d132edc4e3048f2e682c691b3e5b476b9ba8b6 100644 (file)
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -156,7 +156,6 @@ static u16 tx4939ide_check_error_ints(ide_hwif_t *hwif)
                u16 sysctl = tx4939ide_readw(base, TX4939IDE_Sys_Ctl);
 
                tx4939ide_writew(sysctl | 0x4000, base, TX4939IDE_Sys_Ctl);
-               mmiowb();
                /* wait 12GBUSCLK (typ. 60ns @ GBUS200MHz, max 270ns) */
                ndelay(270);
                tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl);
@@ -396,7 +395,6 @@ static void tx4939ide_init_hwif(ide_hwif_t *hwif)
 
        /* Soft Reset */
        tx4939ide_writew(0x8000, base, TX4939IDE_Sys_Ctl);
-       mmiowb();
        /* at least 20 GBUSCLK (typ. 100ns @ GBUS200MHz, max 450ns) */
        ndelay(450);
        tx4939ide_writew(0x0000, base, TX4939IDE_Sys_Ctl);