remove the obsolete IDEPCI_FLAG_FORCE_PDC
PATCH 1/1 remove the obsolete IDEPCI_FLAG_FORCE_PDC
This patch removes the obsolete IDEPCI_FLAG_FORCE_PDC.
Noted by Sergei Shtylylov <[email protected]>
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 7 Apr 2006
drivers/ide/pci/pdc202xx_old.c | 2 -- drivers/ide/setup-pci.c | 13 ------------- include/linux/ide.h | 1 - 3 files changed, 16 deletions(-)
include/linux/ide.h renamed from include/linux/ide.h.old +0 -1
@@ -1221,7 +1221,6 @@enum {/* Uses ISA control ports not PCI ones. */ IDEPCI_FLAG_ISA_PORTS = (1 <<0 ), -IDEPCI_FLAG_FORCE_PDC = (1 <<1 ), }; typedef struct ide_pci_device_s {
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -2
@@ -798,7 +798,6 @@ .autodma = AUTODMA, .bootable = OFF_BOARD, .extra = 48, - .flags = IDEPCI_FLAG_FORCE_PDC, },{ /* 2 */ .name = "PDC20263", .init_setup = init_setup_pdc202ata4,
@@ -819,7 +818,6 @@ .autodma = AUTODMA, .bootable = OFF_BOARD, .extra = 48, - .flags = IDEPCI_FLAG_FORCE_PDC, },{ /* 4 */ .name = "PDC20267", .init_setup = init_setup_pdc202xx,
drivers/ide/setup-pci.c renamed from drivers/ide/setup-pci.c.old +0 -13
@@ -580,7 +580,6 @@int port;int at_least_one_hwif_enabled =0 ;ide_hwif_t *hwif, *mate =NULL ; -static int secondpdc =0 ;u8 tmp; index->all =0xf0f0 ;
@@ -592,21 +591,9 @@for (port =0 ; port <=1 ; ++port) {ide_pci_enablebit_t *e = &(d->enablebits[port]); -/* -* If this is a Promise FakeRaid controller, -* the 2nd controller will be marked as -* disabled while it is actually there and enabled -* by the bios for raid purposes. -* Skip the normal "is it enabled" test for those. -*/ -if ((d->flags &IDEPCI_FLAG_FORCE_PDC ) && - (secondpdc++==1 ) && (port==1 )) - goto controller_ok; -if (e->reg && (pci_read_config_byte (dev, e->reg, &tmp) || (tmp & e->mask) != e->val))continue ;/* port not enabled */ -controller_ok:if (d->channels <= port)break ;