iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] remove the obsolete IDEPCI_FLAG_FORCE_PDC

Browse Source 
Noted by Sergei Shtylylov <sshtylyov@ru.mvista.com>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk 2006-04-18 22:22:07 -07:00 committed by Linus Torvalds
parent 6e89280184
commit d3a7b20299
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/pci/pdc202xx_old.c
View File

@ -798,7 +798,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.autodma = AUTODMA, .autodma = AUTODMA,
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 48, .extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
},{ /* 2 */ },{ /* 2 */
.name = "PDC20263", .name = "PDC20263",
.init_setup = init_setup_pdc202ata4, .init_setup = init_setup_pdc202ata4,
@ -819,7 +818,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.autodma = AUTODMA, .autodma = AUTODMA,
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 48, .extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
},{ /* 4 */ },{ /* 4 */
.name = "PDC20267", .name = "PDC20267",
.init_setup = init_setup_pdc202xx, .init_setup = init_setup_pdc202xx,

13
drivers/ide/setup-pci.c
View File

@ -580,7 +580,6 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
int port; int port;
int at_least_one_hwif_enabled = 0; int at_least_one_hwif_enabled = 0;
ide_hwif_t *hwif, *mate = NULL; ide_hwif_t *hwif, *mate = NULL;
static int secondpdc = 0;
u8 tmp; u8 tmp;
index->all = 0xf0f0; index->all = 0xf0f0;
@ -592,21 +591,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
for (port = 0; port <= 1; ++port) { for (port = 0; port <= 1; ++port) {
ide_pci_enablebit_t *e = &(d->enablebits[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) || if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
(tmp & e->mask) != e->val)) (tmp & e->mask) != e->val))
continue; /* port not enabled */ continue; /* port not enabled */
controller_ok:
if (d->channels <= port) if (d->channels <= port)
break; break;

1
include/linux/ide.h
View File

@ -1220,7 +1220,6 @@ typedef struct ide_pci_enablebit_s {
enum { enum {
/* Uses ISA control ports not PCI ones. */ /* Uses ISA control ports not PCI ones. */
IDEPCI_FLAG_ISA_PORTS = (1 << 0), IDEPCI_FLAG_ISA_PORTS = (1 << 0),
IDEPCI_FLAG_FORCE_PDC = (1 << 1),
}; };
typedef struct ide_pci_device_s { typedef struct ide_pci_device_s {