Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a7b202 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] remove the obsolete IDEPCI_FLAG_FORCE_PDC 



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

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6e892801

drivers/ide/pci/pdc202xx_old.c

+0 −2
Original line number Diff line number Diff line
@@ -798,7 +798,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { 
		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

		.extra		= 48,

		.flags		= IDEPCI_FLAG_FORCE_PDC,

	},{	/* 2 */

		.name		= "PDC20263",

		.init_setup	= init_setup_pdc202ata4,
@@ -819,7 +818,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { 
		.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

+0 −13
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a 
	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 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a 
	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;

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,6 @@ typedef struct ide_pci_enablebit_s { 
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 {