From 71e34e172b0065e7526ea3a685b4b56625acaef2 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 27 Mar 2004 02:51:03 -0800 Subject: [PATCH] [PATCH] remove unused CONFIG_DMA_NONPCI It has been dead since kernel 2.5.18. --- arch/alpha/defconfig | 1 - arch/arm/configs/cerfcube_defconfig | 1 - arch/arm/configs/lart_defconfig | 1 - arch/arm/configs/netwinder_defconfig | 1 - arch/arm/configs/shark_defconfig | 1 - arch/arm/configs/trizeps_defconfig | 1 - arch/i386/defconfig | 1 - arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/sn2_defconfig | 1 - arch/ia64/configs/zx1_defconfig | 1 - arch/ia64/defconfig | 1 - arch/mips/configs/capcella_defconfig | 1 - arch/mips/configs/cobalt_defconfig | 1 - arch/mips/configs/db1500_defconfig | 1 - arch/mips/configs/ddb5476_defconfig | 1 - arch/mips/configs/e55_defconfig | 1 - arch/mips/configs/eagle_defconfig | 1 - arch/mips/configs/hp-lj_defconfig | 1 - arch/mips/configs/it8172_defconfig | 1 - arch/mips/configs/ivr_defconfig | 1 - arch/mips/configs/lasat200_defconfig | 1 - arch/mips/configs/pb1500_defconfig | 1 - arch/mips/configs/tb0226_defconfig | 1 - arch/mips/configs/workpad_defconfig | 1 - arch/parisc/configs/c3000_defconfig | 1 - arch/ppc/configs/common_defconfig | 1 - arch/ppc/configs/cpci405_defconfig | 1 - arch/ppc/configs/pmac_defconfig | 1 - arch/ppc/configs/pplus_defconfig | 1 - arch/ppc/configs/redwood5_defconfig | 1 - arch/ppc/defconfig | 1 - arch/ppc64/configs/g5_defconfig | 1 - arch/ppc64/configs/pSeries_defconfig | 1 - arch/ppc64/defconfig | 1 - arch/sh/defconfig | 1 - arch/sparc64/defconfig | 1 - arch/x86_64/defconfig | 1 - drivers/ide/ide-iops.c | 16 +++++++--------- drivers/ide/ide.c | 5 +---- 39 files changed, 8 insertions(+), 50 deletions(-) diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index 1ae2174362820..3632f72edc54f 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -207,7 +207,6 @@ CONFIG_BLK_DEV_CY82C693=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig index 2a9be5847f035..1701c6ff7f83a 100644 --- a/arch/arm/configs/cerfcube_defconfig +++ b/arch/arm/configs/cerfcube_defconfig @@ -448,7 +448,6 @@ CONFIG_BLK_DEV_IDECS=m # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig index a51f158568465..c1f0b687114a0 100644 --- a/arch/arm/configs/lart_defconfig +++ b/arch/arm/configs/lart_defconfig @@ -469,7 +469,6 @@ CONFIG_BLK_DEV_IDECD=m # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig index dc115ca6bb62c..4ec413887432e 100644 --- a/arch/arm/configs/netwinder_defconfig +++ b/arch/arm/configs/netwinder_defconfig @@ -463,7 +463,6 @@ CONFIG_BLK_DEV_ADMA=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig index 5db0802f2effe..9d90fede9a649 100644 --- a/arch/arm/configs/shark_defconfig +++ b/arch/arm/configs/shark_defconfig @@ -381,7 +381,6 @@ CONFIG_BLK_DEV_IDEFLOPPY=y # CONFIG_IDE_CHIPSETS is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/arm/configs/trizeps_defconfig b/arch/arm/configs/trizeps_defconfig index 89059c63257ab..c2415315f218c 100644 --- a/arch/arm/configs/trizeps_defconfig +++ b/arch/arm/configs/trizeps_defconfig @@ -493,7 +493,6 @@ CONFIG_BLK_DEV_IDECS=m # CONFIG_BLK_DEV_IDE_RAPIDE is not set # CONFIG_IDE_CHIPSETS is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # # SCSI support diff --git a/arch/i386/defconfig b/arch/i386/defconfig index e3e91997eabdd..d7cea320a4159 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -304,7 +304,6 @@ CONFIG_BLK_DEV_PIIX=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 2da33c9dd5240..d7612bd9a11a5 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -214,7 +214,6 @@ CONFIG_BLK_DEV_PIIX=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 666b2cf961bf6..8e790347d14a0 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -221,7 +221,6 @@ CONFIG_BLK_DEV_SGIIOC4=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 815ba2771f981..29f1aa66f1073 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig @@ -211,7 +211,6 @@ CONFIG_BLK_DEV_CMD64X=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index f839a337d999b..5020e8bf49d65 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -218,7 +218,6 @@ CONFIG_BLK_DEV_SIIMAGE=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index f48afe111b098..59e065f1ae97a 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig @@ -196,7 +196,6 @@ CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 15d9689b1ba95..91f58b9930e31 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig @@ -189,7 +189,6 @@ CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index 20a8107db502a..0e890d112b9d2 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig @@ -268,7 +268,6 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 1411e5162509b..e6e3879f4f967 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig @@ -188,7 +188,6 @@ CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 549806683c59c..3e9f7e82a4177 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig @@ -188,7 +188,6 @@ CONFIG_IDE_TASKFILE_IO=y CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/eagle_defconfig b/arch/mips/configs/eagle_defconfig index 9cab87974e316..0bb084e091b3d 100644 --- a/arch/mips/configs/eagle_defconfig +++ b/arch/mips/configs/eagle_defconfig @@ -273,7 +273,6 @@ CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/hp-lj_defconfig b/arch/mips/configs/hp-lj_defconfig index 47836bfdea46f..9b7e7b7458d04 100644 --- a/arch/mips/configs/hp-lj_defconfig +++ b/arch/mips/configs/hp-lj_defconfig @@ -245,7 +245,6 @@ CONFIG_IDE_TASKFILE_IO=y CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index a129a2f53825d..79a7ab581bc3a 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig @@ -243,7 +243,6 @@ CONFIG_IDE_TASKFILE_IO=y CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 2c81265918af3..63c6c168e021a 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig @@ -191,7 +191,6 @@ CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index 4d411c766ff5e..24a0e49b7c36d 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig @@ -284,7 +284,6 @@ CONFIG_BLK_DEV_CMD64X=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index c51eaa38b11ef..b0de946cf71df 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig @@ -251,7 +251,6 @@ CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 319b9d9392d6e..a2b34f8d0ee82 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig @@ -192,7 +192,6 @@ CONFIG_IDE_TASKFILE_IO=y CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index 993b7df495986..6c55146cb69c1 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig @@ -188,7 +188,6 @@ CONFIG_IDE_TASKFILE_IO=y CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index 1f8d98bf14893..1ad8604937b59 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig @@ -186,7 +186,6 @@ CONFIG_BLK_DEV_SIIMAGE=m CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig index c6ac04c62f784..1376107a6867a 100644 --- a/arch/ppc/configs/common_defconfig +++ b/arch/ppc/configs/common_defconfig @@ -241,7 +241,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc/configs/cpci405_defconfig b/arch/ppc/configs/cpci405_defconfig index ce90cd4b5a825..c3e992afdd7e9 100644 --- a/arch/ppc/configs/cpci405_defconfig +++ b/arch/ppc/configs/cpci405_defconfig @@ -177,7 +177,6 @@ CONFIG_BLK_DEV_IDEDISK=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig index d4151777e3521..18b511ba3287c 100644 --- a/arch/ppc/configs/pmac_defconfig +++ b/arch/ppc/configs/pmac_defconfig @@ -247,7 +247,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc/configs/pplus_defconfig b/arch/ppc/configs/pplus_defconfig index b72063c9b748b..b26d5085725fe 100644 --- a/arch/ppc/configs/pplus_defconfig +++ b/arch/ppc/configs/pplus_defconfig @@ -180,7 +180,6 @@ CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEPCI is not set # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc/configs/redwood5_defconfig b/arch/ppc/configs/redwood5_defconfig index a5c6432b612e5..5e19714acd2e3 100644 --- a/arch/ppc/configs/redwood5_defconfig +++ b/arch/ppc/configs/redwood5_defconfig @@ -173,7 +173,6 @@ CONFIG_BLK_DEV_IDEDISK=y # # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index ec1e609bcc10c..ca8f8a2687106 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -248,7 +248,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig index 2230b43119a4b..c5739bf3cb4a3 100644 --- a/arch/ppc64/configs/g5_defconfig +++ b/arch/ppc64/configs/g5_defconfig @@ -195,7 +195,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig index af80676e2dc4a..280ca7fb40a65 100644 --- a/arch/ppc64/configs/pSeries_defconfig +++ b/arch/ppc64/configs/pSeries_defconfig @@ -197,7 +197,6 @@ CONFIG_BLK_DEV_AMD74XX=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig index af80676e2dc4a..280ca7fb40a65 100644 --- a/arch/ppc64/defconfig +++ b/arch/ppc64/defconfig @@ -197,7 +197,6 @@ CONFIG_BLK_DEV_AMD74XX=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/sh/defconfig b/arch/sh/defconfig index ec6ea5496a055..44ec26ea55053 100644 --- a/arch/sh/defconfig +++ b/arch/sh/defconfig @@ -152,7 +152,6 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_IDEDMA is not set # CONFIG_IDEDMA_AUTO is not set -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 43842a7f13e4e..4feeb5fb62807 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -277,7 +277,6 @@ CONFIG_BLK_DEV_VIA82CXXX=m CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index c010a255f92a1..c4e3ccd82d1bd 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig @@ -235,7 +235,6 @@ CONFIG_BLK_DEV_PIIX=y CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y -# CONFIG_DMA_NONPCI is not set # CONFIG_BLK_DEV_HD is not set # diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 1755d50714f6c..eb943429b0b80 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -829,10 +829,10 @@ int ide_config_drive_speed (ide_drive_t *drive, u8 speed) // while (HWGROUP(drive)->busy) // ide_delay_50ms(); -#if defined(CONFIG_BLK_DEV_IDEDMA) && !defined(CONFIG_DMA_NONPCI) +#ifdef CONFIG_BLK_DEV_IDEDMA if (hwif->ide_dma_check) /* check if host supports DMA */ hwif->ide_dma_host_off(drive); -#endif /* (CONFIG_BLK_DEV_IDEDMA) && !(CONFIG_DMA_NONPCI) */ +#endif /* * Don't use ide_wait_cmd here - it will @@ -906,14 +906,12 @@ int ide_config_drive_speed (ide_drive_t *drive, u8 speed) drive->id->dma_mword &= ~0x0F00; drive->id->dma_1word &= ~0x0F00; -#if defined(CONFIG_BLK_DEV_IDEDMA) && !defined(CONFIG_DMA_NONPCI) - if (speed >= XFER_SW_DMA_0) { +#ifdef CONFIG_BLK_DEV_IDEDMA + if (speed >= XFER_SW_DMA_0) hwif->ide_dma_host_on(drive); - } else { - if (hwif->ide_dma_check) /* check if host supports DMA */ - hwif->ide_dma_off_quietly(drive); - } -#endif /* (CONFIG_BLK_DEV_IDEDMA) && !(CONFIG_DMA_NONPCI) */ + else if (hwif->ide_dma_check) /* check if host supports DMA */ + hwif->ide_dma_off_quietly(drive); +#endif switch(speed) { case XFER_UDMA_7: drive->id->dma_ultra |= 0x8080; break; diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 6ece03937c3f5..135f0d89eadef 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -737,7 +737,6 @@ void ide_unregister (unsigned int index) unregister_blkdev(hwif->major, hwif->name); spin_lock_irq(&ide_lock); -#if !defined(CONFIG_DMA_NONPCI) if (hwif->dma_base) { (void) ide_release_dma(hwif); @@ -749,7 +748,7 @@ void ide_unregister (unsigned int index) hwif->dma_vendor3 = 0; hwif->dma_prdtable = 0; } -#endif /* !(CONFIG_DMA_NONPCI) */ + old_hwif = *hwif; init_hwif_data(index); /* restore hwif data to pristine status */ hwif->hwgroup = old_hwif.hwgroup; @@ -2424,10 +2423,8 @@ void cleanup_module (void) for (index = 0; index < MAX_HWIFS; ++index) { ide_unregister(index); -#if !defined(CONFIG_DMA_NONPCI) if (ide_hwifs[index].dma_base) (void) ide_release_dma(&ide_hwifs[index]); -#endif /* !(CONFIG_DMA_NONPCI) */ } #ifdef CONFIG_PROC_FS -- 2.53.0