Skip to content

L
linux
Commit 71e34e17 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds
Browse files
Options

[PATCH] remove unused CONFIG_DMA_NONPCI 

It has been dead since kernel 2.5.18.
parent 1dce91a8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 50 deletions
arch/alpha/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/arm/configs/cerfcube_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/arm/configs/lart_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/arm/configs/netwinder_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/arm/configs/shark_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/arm/configs/trizeps_defconfig
View file @ 71e34e17
......@@ -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
......
arch/i386/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ia64/configs/generic_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ia64/configs/sn2_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ia64/configs/zx1_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ia64/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/capcella_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/cobalt_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/db1500_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/ddb5476_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/e55_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/eagle_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/hp-lj_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/it8172_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/ivr_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/lasat200_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/pb1500_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/tb0226_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/mips/configs/workpad_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/parisc/configs/c3000_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc/configs/common_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc/configs/cpci405_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc/configs/pmac_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc/configs/pplus_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc/configs/redwood5_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc64/configs/g5_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc64/configs/pSeries_defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/ppc64/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/sh/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/sparc64/defconfig
View file @ 71e34e17
......@@ -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
#
......
arch/x86_64/defconfig
View file @ 71e34e17
......@@ -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
#
......
drivers/ide/ide-iops.c
View file @ 71e34e17
......@@ -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;
......
drivers/ide/ide.c
View file @ 71e34e17
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7