* [2.6 patch] Fix PDC202XX_FORCE kconfig selection
@ 2006-01-14 15:21 Adrian Bunk
2006-01-14 16:13 ` Alan Cox
0 siblings, 1 reply; 10+ messages in thread
From: Adrian Bunk @ 2006-01-14 15:21 UTC (permalink / raw)
To: B.Zolnierkiewicz; +Cc: linux-kernel, linux-ide, Andrey J. Melnikoff
Split PDC202XX_FORCE selection into two independ option and allow user
select it only for specific driver.
Signed-off-by: Andrey Melnikov <temnota@kmv.ru>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was sent by Andrey J. Melnikoff on:
- 28 Dec 2005
drivers/ide/Kconfig | 9 +++++++--
drivers/ide/pci/pdc202xx_new.c | 4 ++--
drivers/ide/pci/pdc202xx_old.c | 10 +++++-----
3 files changed, 14 insertions(+), 9 deletions(-)
--- linux/drivers/ide/Kconfig~ 2005-12-28 21:51:52.000000000 +0300
+++ linux/drivers/ide/Kconfig 2005-12-28 21:51:52.000000000 +0300
@@ -670,11 +670,16 @@
If unsure, say N.
+config PDC202XX_OLD_FORCE
+ bool "Enable controller even if disabled by BIOS"
+ depends on BLK_DEV_PDC202XX_OLD
+ help
+ Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
+
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
+config PDC202XX_NEW_FORCE
bool "Enable controller even if disabled by BIOS"
depends on BLK_DEV_PDC202XX_NEW
help
--- linux/drivers/ide/pci/pdc202xx_new.c~ 2005-12-28 21:52:32.000000000 +0300
+++ linux/drivers/ide/pci/pdc202xx_new.c 2005-12-28 21:52:32.000000000 +0300
@@ -420,7 +420,7 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_NEW_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
@@ -447,7 +447,7 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_NEW_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
--- linux/drivers/ide/pci/pdc202xx_old.c~ 2005-12-28 21:53:26.000000000 +0300
+++ linux/drivers/ide/pci/pdc202xx_old.c 2005-12-28 21:53:26.000000000 +0300
@@ -786,7 +786,7 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_OLD_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
@@ -799,7 +799,7 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_OLD_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
@@ -813,7 +813,7 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_OLD_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
@@ -826,7 +826,7 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_OLD_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
@@ -840,7 +840,7 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
+#ifndef CONFIG_PDC202XX_OLD_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD,
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [2.6 patch] Fix PDC202XX_FORCE kconfig selection
2006-01-14 15:21 [2.6 patch] Fix PDC202XX_FORCE kconfig selection Adrian Bunk
@ 2006-01-14 16:13 ` Alan Cox
2006-01-14 17:47 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 10+ messages in thread
From: Alan Cox @ 2006-01-14 16:13 UTC (permalink / raw)
To: Adrian Bunk
Cc: B.Zolnierkiewicz, linux-kernel, linux-ide, Andrey J. Melnikoff
On Sad, 2006-01-14 at 16:21 +0100, Adrian Bunk wrote:
> Split PDC202XX_FORCE selection into two independ option and allow user
> select it only for specific driver.
Seems pointless. We should always grab the raid cards. The option itself
is a mistake
Alan
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [2.6 patch] Fix PDC202XX_FORCE kconfig selection
2006-01-14 16:13 ` Alan Cox
@ 2006-01-14 17:47 ` Bartlomiej Zolnierkiewicz
2006-01-14 19:55 ` [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
0 siblings, 1 reply; 10+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2006-01-14 17:47 UTC (permalink / raw)
To: Alan Cox; +Cc: Adrian Bunk, linux-kernel, linux-ide, Andrey J. Melnikoff
On 1/14/06, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> On Sad, 2006-01-14 at 16:21 +0100, Adrian Bunk wrote:
> > Split PDC202XX_FORCE selection into two independ option and allow user
> > select it only for specific driver.
>
> Seems pointless. We should always grab the raid cards. The option itself
> is a mistake
Alan is right, these cards should always be grabbed in 2.6.x kernels.
This option is a leftover from earlier 2.4.x days when Promise binary
driver was available for using software RAID.
Could somebody submit a patch removing CONFIG_PDC202XX_FORCE?
Bartlomiej
^ permalink raw reply [flat|nested] 10+ messages in thread
* [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-14 17:47 ` Bartlomiej Zolnierkiewicz
@ 2006-01-14 19:55 ` Adrian Bunk
2006-01-15 1:07 ` Alan Cox
0 siblings, 1 reply; 10+ messages in thread
From: Adrian Bunk @ 2006-01-14 19:55 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: Alan Cox, linux-kernel, linux-ide, Andrey J. Melnikoff
On Sat, Jan 14, 2006 at 06:47:31PM +0100, Bartlomiej Zolnierkiewicz wrote:
> On 1/14/06, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> > On Sad, 2006-01-14 at 16:21 +0100, Adrian Bunk wrote:
> > > Split PDC202XX_FORCE selection into two independ option and allow user
> > > select it only for specific driver.
> >
> > Seems pointless. We should always grab the raid cards. The option itself
> > is a mistake
>
> Alan is right, these cards should always be grabbed in 2.6.x kernels.
> This option is a leftover from earlier 2.4.x days when Promise binary
> driver was available for using software RAID.
>
> Could somebody submit a patch removing CONFIG_PDC202XX_FORCE?
Patch below.
> Bartlomiej
cu
Adrian
<-- snip -->
This patch removes the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/ide/Kconfig | 7 -------
drivers/ide/pci/pdc202xx_new.c | 6 ------
drivers/ide/pci/pdc202xx_old.c | 15 ---------------
3 files changed, 28 deletions(-)
--- linux-2.6.15-mm4-full/drivers/ide/Kconfig.old 2006-01-14 20:43:13.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/Kconfig 2006-01-14 20:43:23.000000000 +0100
@@ -673,13 +673,6 @@
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
- bool "Enable controller even if disabled by BIOS"
- depends on BLK_DEV_PDC202XX_NEW
- help
- Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c.old 2006-01-14 20:43:30.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c 2006-01-14 20:43:51.000000000 +0100
@@ -420,9 +420,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 3 */
.name = "PDC20271",
@@ -447,9 +444,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 6 */
.name = "PDC20277",
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
@@ -786,9 +786,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 16,
},{ /* 1 */
@@ -799,9 +796,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
},{ /* 3 */
@@ -826,9 +817,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
}
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-14 19:55 ` [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
@ 2006-01-15 1:07 ` Alan Cox
2006-01-15 1:50 ` Adrian Bunk
0 siblings, 1 reply; 10+ messages in thread
From: Alan Cox @ 2006-01-15 1:07 UTC (permalink / raw)
To: Adrian Bunk
Cc: Bartlomiej Zolnierkiewicz, linux-kernel, linux-ide, Andrey J. Melnikoff
On Sad, 2006-01-14 at 20:55 +0100, Adrian Bunk wrote:
> This patch removes the CONFIG_PDC202XX_FORCE=n case.
NAK. The Y case is the one you want to keep
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-15 1:07 ` Alan Cox
@ 2006-01-15 1:50 ` Adrian Bunk
0 siblings, 0 replies; 10+ messages in thread
From: Adrian Bunk @ 2006-01-15 1:50 UTC (permalink / raw)
To: Alan Cox
Cc: Bartlomiej Zolnierkiewicz, linux-kernel, linux-ide, Andrey J. Melnikoff
On Sun, Jan 15, 2006 at 01:07:29AM +0000, Alan Cox wrote:
> On Sad, 2006-01-14 at 20:55 +0100, Adrian Bunk wrote:
> > This patch removes the CONFIG_PDC202XX_FORCE=n case.
>
> NAK. The Y case is the one you want to keep
Removing the N case is the same as keeping the Y case...
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 10+ messages in thread
* [2.6 patch] always enable CONFIG_PDC202XX_FORCE
@ 2006-01-22 17:12 Adrian Bunk
2006-03-27 14:25 ` Sergei Shtylylov
0 siblings, 1 reply; 10+ messages in thread
From: Adrian Bunk @ 2006-01-22 17:12 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Alan Cox, linux-kernel, linux-ide
This patch removes the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 14 Jan 2006
drivers/ide/Kconfig | 7 -------
drivers/ide/pci/pdc202xx_new.c | 6 ------
drivers/ide/pci/pdc202xx_old.c | 15 ---------------
3 files changed, 28 deletions(-)
--- linux-2.6.15-mm4-full/drivers/ide/Kconfig.old 2006-01-14 20:43:13.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/Kconfig 2006-01-14 20:43:23.000000000 +0100
@@ -673,13 +673,6 @@
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
- bool "Enable controller even if disabled by BIOS"
- depends on BLK_DEV_PDC202XX_NEW
- help
- Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c.old 2006-01-14 20:43:30.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c 2006-01-14 20:43:51.000000000 +0100
@@ -420,9 +420,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 3 */
.name = "PDC20271",
@@ -447,9 +444,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 6 */
.name = "PDC20277",
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
@@ -786,9 +786,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 16,
},{ /* 1 */
@@ -799,9 +796,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
},{ /* 3 */
@@ -826,9 +817,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
}
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-01-22 17:12 Adrian Bunk
@ 2006-03-27 14:25 ` Sergei Shtylylov
2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 10+ messages in thread
From: Sergei Shtylylov @ 2006-03-27 14:25 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Bartlomiej Zolnierkiewicz, Alan Cox, linux-kernel, linux-ide
Hello.
Adrian Bunk wrote:
> This patch removes the CONFIG_PDC202XX_FORCE=n case.
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
>
> This patch was already sent on:
> - 14 Jan 2006
>
> drivers/ide/Kconfig | 7 -------
> drivers/ide/pci/pdc202xx_new.c | 6 ------
> drivers/ide/pci/pdc202xx_old.c | 15 ---------------
> 3 files changed, 28 deletions(-)
[skipped]
> --- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
> +++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
> @@ -786,9 +786,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 16,
> },{ /* 1 */
> @@ -799,9 +796,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> .flags = IDEPCI_FLAG_FORCE_PDC,
A late question: wasn't that IDEPCI_FLAG_FORCE_PDC flag there for the same
purpose -- to bypass enablebits check? Wasn't it enough?
> @@ -813,9 +807,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> },{ /* 3 */
> @@ -826,9 +817,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> .flags = IDEPCI_FLAG_FORCE_PDC,
> @@ -840,9 +828,6 @@
> .init_dma = init_dma_pdc202xx,
> .channels = 2,
> .autodma = AUTODMA,
> -#ifndef CONFIG_PDC202XX_FORCE
> - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> -#endif
> .bootable = OFF_BOARD,
> .extra = 48,
> }
WBR, Sergei
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
2006-03-27 14:25 ` Sergei Shtylylov
@ 2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 10+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2006-03-27 14:40 UTC (permalink / raw)
To: Sergei Shtylylov; +Cc: Adrian Bunk, Alan Cox, linux-kernel, linux-ide
On 3/27/06, Sergei Shtylylov <sshtylyov@ru.mvista.com> wrote:
> Hello.
>
> Adrian Bunk wrote:
>
> > This patch removes the CONFIG_PDC202XX_FORCE=n case.
>
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> > ---
> >
> > This patch was already sent on:
> > - 14 Jan 2006
> >
> > drivers/ide/Kconfig | 7 -------
> > drivers/ide/pci/pdc202xx_new.c | 6 ------
> > drivers/ide/pci/pdc202xx_old.c | 15 ---------------
> > 3 files changed, 28 deletions(-)
>
> [skipped]
>
> > --- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
> > +++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
> > @@ -786,9 +786,6 @@
> > .init_dma = init_dma_pdc202xx,
> > .channels = 2,
> > .autodma = AUTODMA,
> > -#ifndef CONFIG_PDC202XX_FORCE
> > - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> > -#endif
> > .bootable = OFF_BOARD,
> > .extra = 16,
> > },{ /* 1 */
> > @@ -799,9 +796,6 @@
> > .init_dma = init_dma_pdc202xx,
> > .channels = 2,
> > .autodma = AUTODMA,
> > -#ifndef CONFIG_PDC202XX_FORCE
> > - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
> > -#endif
> > .bootable = OFF_BOARD,
> > .extra = 48,
> > .flags = IDEPCI_FLAG_FORCE_PDC,
>
> A late question: wasn't that IDEPCI_FLAG_FORCE_PDC flag there for the same
> purpose -- to bypass enablebits check? Wasn't it enough?
It was for the same purpose but it wasn't enough,
now this flag can die...
Bartlomiej
^ permalink raw reply [flat|nested] 10+ messages in thread
* [2.6 patch] always enable CONFIG_PDC202XX_FORCE
@ 2006-01-28 23:04 Adrian Bunk
0 siblings, 0 replies; 10+ messages in thread
From: Adrian Bunk @ 2006-01-28 23:04 UTC (permalink / raw)
To: Andrew Morton
Cc: Bartlomiej Zolnierkiewicz, Alan Cox, linux-kernel, linux-ide
This patch removes the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 22 Jan 2006
- 14 Jan 2006
drivers/ide/Kconfig | 7 -------
drivers/ide/pci/pdc202xx_new.c | 6 ------
drivers/ide/pci/pdc202xx_old.c | 15 ---------------
3 files changed, 28 deletions(-)
--- linux-2.6.15-mm4-full/drivers/ide/Kconfig.old 2006-01-14 20:43:13.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/Kconfig 2006-01-14 20:43:23.000000000 +0100
@@ -673,13 +673,6 @@
config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
- bool "Enable controller even if disabled by BIOS"
- depends on BLK_DEV_PDC202XX_NEW
- help
- Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c.old 2006-01-14 20:43:30.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_new.c 2006-01-14 20:43:51.000000000 +0100
@@ -420,9 +420,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 3 */
.name = "PDC20271",
@@ -447,9 +444,6 @@
.init_hwif = init_hwif_pdc202new,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
},{ /* 6 */
.name = "PDC20277",
--- linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c.old 2006-01-14 20:44:01.000000000 +0100
+++ linux-2.6.15-mm4-full/drivers/ide/pci/pdc202xx_old.c 2006-01-14 20:44:21.000000000 +0100
@@ -786,9 +786,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 16,
},{ /* 1 */
@@ -799,9 +796,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
},{ /* 3 */
@@ -826,9 +817,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@
.init_dma = init_dma_pdc202xx,
.channels = 2,
.autodma = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
- .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
.bootable = OFF_BOARD,
.extra = 48,
}
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2006-03-27 14:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-14 15:21 [2.6 patch] Fix PDC202XX_FORCE kconfig selection Adrian Bunk
2006-01-14 16:13 ` Alan Cox
2006-01-14 17:47 ` Bartlomiej Zolnierkiewicz
2006-01-14 19:55 ` [2.6 patch] always enable CONFIG_PDC202XX_FORCE Adrian Bunk
2006-01-15 1:07 ` Alan Cox
2006-01-15 1:50 ` Adrian Bunk
2006-01-22 17:12 Adrian Bunk
2006-03-27 14:25 ` Sergei Shtylylov
2006-03-27 14:40 ` Bartlomiej Zolnierkiewicz
2006-01-28 23:04 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).