From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [2.6 patch] remove the obsolete IDEPCI_FLAG_FORCE_PDC
Date: Sun, 9 Apr 2006 21:53:33 +0200 [thread overview]
Message-ID: <20060409195333.GL8454@stusta.de> (raw)
This patch removes 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>
---
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(-)
--- linux-2.6.17-rc1-mm1-full/include/linux/ide.h.old 2006-04-07 00:51:49.000000000 +0200
+++ linux-2.6.17-rc1-mm1-full/include/linux/ide.h 2006-04-07 00:52:03.000000000 +0200
@@ -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 {
--- linux-2.6.17-rc1-mm1-full/drivers/ide/pci/pdc202xx_old.c.old 2006-04-07 00:52:13.000000000 +0200
+++ linux-2.6.17-rc1-mm1-full/drivers/ide/pci/pdc202xx_old.c 2006-04-07 00:52:19.000000000 +0200
@@ -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,
--- linux-2.6.17-rc1-mm1-full/drivers/ide/setup-pci.c.old 2006-04-07 00:52:27.000000000 +0200
+++ linux-2.6.17-rc1-mm1-full/drivers/ide/setup-pci.c 2006-04-07 00:54:28.000000000 +0200
@@ -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;
next reply other threads:[~2006-04-09 19:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-09 19:53 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-01-22 17:12 [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
2006-03-27 14:25 ` Sergei Shtylylov
2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
2006-04-07 0:31 ` [2.6 patch] remove the obsolete IDEPCI_FLAG_FORCE_PDC Adrian Bunk
2006-04-07 11:41 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060409195333.GL8454@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=bzolnier@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox