Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] remove the obsolete IDEPCI_FLAG_FORCE_PDC

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>

authored by

Adrian Bunk and committed by
Linus Torvalds
d3a7b202 6e892801

-16
-2
drivers/ide/pci/pdc202xx_old.c
··· 798 798 .autodma = AUTODMA, 799 799 .bootable = OFF_BOARD, 800 800 .extra = 48, 801 - .flags = IDEPCI_FLAG_FORCE_PDC, 802 801 },{ /* 2 */ 803 802 .name = "PDC20263", 804 803 .init_setup = init_setup_pdc202ata4, ··· 818 819 .autodma = AUTODMA, 819 820 .bootable = OFF_BOARD, 820 821 .extra = 48, 821 - .flags = IDEPCI_FLAG_FORCE_PDC, 822 822 },{ /* 4 */ 823 823 .name = "PDC20267", 824 824 .init_setup = init_setup_pdc202xx,
-13
drivers/ide/setup-pci.c
··· 580 580 int port; 581 581 int at_least_one_hwif_enabled = 0; 582 582 ide_hwif_t *hwif, *mate = NULL; 583 - static int secondpdc = 0; 584 583 u8 tmp; 585 584 586 585 index->all = 0xf0f0; ··· 591 592 for (port = 0; port <= 1; ++port) { 592 593 ide_pci_enablebit_t *e = &(d->enablebits[port]); 593 594 594 - /* 595 - * If this is a Promise FakeRaid controller, 596 - * the 2nd controller will be marked as 597 - * disabled while it is actually there and enabled 598 - * by the bios for raid purposes. 599 - * Skip the normal "is it enabled" test for those. 600 - */ 601 - if ((d->flags & IDEPCI_FLAG_FORCE_PDC) && 602 - (secondpdc++==1) && (port==1)) 603 - goto controller_ok; 604 - 605 595 if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) || 606 596 (tmp & e->mask) != e->val)) 607 597 continue; /* port not enabled */ 608 - controller_ok: 609 598 610 599 if (d->channels <= port) 611 600 break;
-1
include/linux/ide.h
··· 1220 1220 enum { 1221 1221 /* Uses ISA control ports not PCI ones. */ 1222 1222 IDEPCI_FLAG_ISA_PORTS = (1 << 0), 1223 - IDEPCI_FLAG_FORCE_PDC = (1 << 1), 1224 1223 }; 1225 1224 1226 1225 typedef struct ide_pci_device_s {