Skip to content

L
linux
Commit 4729a80c authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] clean up highpoint ide for new dma ifdef stuff

parent 7e174fd3
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
drivers/ide/pci/hpt34x.c
View file @ 4729a80c
...@@ -159,13 +159,13 @@ static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio) ...@@ -159,13 +159,13 @@ static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio)
(void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio)); (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio));
} }
#ifdef CONFIG_BLK_DEV_IDEDMA
/* /*
* This allows the configuration of ide_pci chipset registers * This allows the configuration of ide_pci chipset registers
* for cards that learn about the drive's UDMA, DMA, PIO capabilities * for cards that learn about the drive's UDMA, DMA, PIO capabilities
* after the drive is reported by the OS. Initally for designed for * after the drive is reported by the OS. Initally for designed for
* HPT343 UDMA chipset by HighPoint|Triones Technologies, Inc. * HPT343 UDMA chipset by HighPoint|Triones Technologies, Inc.
*/ */
static int config_chipset_for_dma (ide_drive_t *drive) static int config_chipset_for_dma (ide_drive_t *drive)
{ {
u8 speed = ide_dma_speed(drive, hpt34x_ratemask(drive)); u8 speed = ide_dma_speed(drive, hpt34x_ratemask(drive));
...@@ -224,7 +224,6 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) ...@@ -224,7 +224,6 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
#endif /* CONFIG_HPT34X_AUTODMA */ #endif /* CONFIG_HPT34X_AUTODMA */
return hwif->ide_dma_on(drive); return hwif->ide_dma_on(drive);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* /*
* If the BIOS does not set the IO base addaress to XX00, 343 will fail. * If the BIOS does not set the IO base addaress to XX00, 343 will fail.
...@@ -306,13 +305,11 @@ static void __init init_hwif_hpt34x (ide_hwif_t *hwif) ...@@ -306,13 +305,11 @@ static void __init init_hwif_hpt34x (ide_hwif_t *hwif)
hwif->mwdma_mask = 0x07; hwif->mwdma_mask = 0x07;
hwif->swdma_mask = 0x07; hwif->swdma_mask = 0x07;
#ifdef CONFIG_BLK_DEV_IDEDMA
hwif->ide_dma_check = &hpt34x_config_drive_xfer_rate; hwif->ide_dma_check = &hpt34x_config_drive_xfer_rate;
if (!noautodma) if (!noautodma)
hwif->autodma = (pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0; hwif->autodma = (pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0;
hwif->drives[0].autodma = hwif->autodma; hwif->drives[0].autodma = hwif->autodma;
hwif->drives[1].autodma = hwif->autodma; hwif->drives[1].autodma = hwif->autodma;
#endif /* CONFIG_BLK_DEV_IDEDMA */
} }
static void __init init_dma_hpt34x (ide_hwif_t *hwif, unsigned long dmabase) static void __init init_dma_hpt34x (ide_hwif_t *hwif, unsigned long dmabase)
......
drivers/ide/pci/hpt366.c
View file @ 4729a80c
...@@ -216,7 +216,6 @@ static u8 hpt3xx_ratemask (ide_drive_t *drive) ...@@ -216,7 +216,6 @@ static u8 hpt3xx_ratemask (ide_drive_t *drive)
static u8 hpt3xx_ratefilter (ide_drive_t *drive, u8 speed) static u8 hpt3xx_ratefilter (ide_drive_t *drive, u8 speed)
{ {
#ifdef CONFIG_BLK_DEV_IDEDMA
struct pci_dev *dev = HWIF(drive)->pci_dev; struct pci_dev *dev = HWIF(drive)->pci_dev;
u8 mode = hpt3xx_ratemask(drive); u8 mode = hpt3xx_ratemask(drive);
...@@ -264,9 +263,6 @@ static u8 hpt3xx_ratefilter (ide_drive_t *drive, u8 speed) ...@@ -264,9 +263,6 @@ static u8 hpt3xx_ratefilter (ide_drive_t *drive, u8 speed)
break; break;
} }
return speed; return speed;
#else
return min(speed, (u8)XFER_PIO_4);
#endif /* CONFIG_BLK_DEV_IDEDMA */
} }
static int check_in_drive_lists (ide_drive_t *drive, const char **list) static int check_in_drive_lists (ide_drive_t *drive, const char **list)
...@@ -444,7 +440,6 @@ static void hpt3xx_tune_drive (ide_drive_t *drive, u8 pio) ...@@ -444,7 +440,6 @@ static void hpt3xx_tune_drive (ide_drive_t *drive, u8 pio)
(void) hpt3xx_tune_chipset(drive, (XFER_PIO_0 + pio)); (void) hpt3xx_tune_chipset(drive, (XFER_PIO_0 + pio));
} }
#ifdef CONFIG_BLK_DEV_IDEDMA
/* /*
* This allows the configuration of ide_pci chipset registers * This allows the configuration of ide_pci chipset registers
* for cards that learn about the drive's UDMA, DMA, PIO capabilities * for cards that learn about the drive's UDMA, DMA, PIO capabilities
...@@ -654,7 +649,6 @@ static int hpt374_ide_dma_end (ide_drive_t *drive) ...@@ -654,7 +649,6 @@ static int hpt374_ide_dma_end (ide_drive_t *drive)
pci_write_config_byte(dev, mscreg, msc_stat|0x30); pci_write_config_byte(dev, mscreg, msc_stat|0x30);
return __ide_dma_end(drive); return __ide_dma_end(drive);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* /*
* Since SUN Cobalt is attempting to do this operation, I should disclose * Since SUN Cobalt is attempting to do this operation, I should disclose
...@@ -1030,7 +1024,6 @@ static void __init init_hwif_hpt366 (ide_hwif_t *hwif) ...@@ -1030,7 +1024,6 @@ static void __init init_hwif_hpt366 (ide_hwif_t *hwif)
hwif->ultra_mask = 0x7f; hwif->ultra_mask = 0x7f;
hwif->mwdma_mask = 0x07; hwif->mwdma_mask = 0x07;
#ifdef CONFIG_BLK_DEV_IDEDMA
if (!(hwif->udma_four)) if (!(hwif->udma_four))
hwif->udma_four = ((ata66 & regmask) ? 0 : 1); hwif->udma_four = ((ata66 & regmask) ? 0 : 1);
hwif->ide_dma_check = &hpt366_config_drive_xfer_rate; hwif->ide_dma_check = &hpt366_config_drive_xfer_rate;
...@@ -1053,7 +1046,6 @@ static void __init init_hwif_hpt366 (ide_hwif_t *hwif) ...@@ -1053,7 +1046,6 @@ static void __init init_hwif_hpt366 (ide_hwif_t *hwif)
hwif->autodma = 1; hwif->autodma = 1;
hwif->drives[0].autodma = hwif->autodma; hwif->drives[0].autodma = hwif->autodma;
hwif->drives[1].autodma = hwif->autodma; hwif->drives[1].autodma = hwif->autodma;
#endif /* CONFIG_BLK_DEV_IDEDMA */
} }
static void __init init_dma_hpt366 (ide_hwif_t *hwif, unsigned long dmabase) static void __init init_dma_hpt366 (ide_hwif_t *hwif, unsigned long dmabase)
......
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