* Re: [PATCH 1/2] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
2008-02-14 20:55 [PATCH 1/2] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS Bartlomiej Zolnierkiewicz
@ 2008-02-14 20:55 ` Sam Ravnborg
2008-02-14 21:24 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 4+ messages in thread
From: Sam Ravnborg @ 2008-02-14 20:55 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel
Hi Bart.
On Thu, Feb 14, 2008 at 09:55:50PM +0100, Bartlomiej Zolnierkiewicz wrote:
> Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use
> it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.
>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
> drivers/ide/Kconfig | 3 +++
> drivers/ide/ide.c | 5 +++++
> include/asm-alpha/ide.h | 3 ---
> include/asm-ia64/ide.h | 2 --
> include/asm-m32r/ide.h | 2 --
> include/asm-mips/mach-generic/ide.h | 2 --
> include/asm-powerpc/ide.h | 2 --
> include/asm-x86/ide.h | 2 --
> include/linux/ide.h | 7 -------
> 9 files changed, 8 insertions(+), 20 deletions(-)
>
> Index: b/drivers/ide/Kconfig
> ===================================================================
> --- a/drivers/ide/Kconfig
> +++ b/drivers/ide/Kconfig
> @@ -1099,6 +1099,9 @@ config BLK_DEV_IDEDMA
> config IDE_ARCH_OBSOLETE_INIT
> def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
>
> +config IDE_ARCH_OBSOLETE_DEFAULTS
> + def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32
> +
> endif
This time it is maybe borderline as it makes sense to see a list of
archs that uses this.
But still I would prefer you did like this:
drivers/ide/Kconfig:
config HAVE_IDE_ARCH_OBSOLETE_DEFAULTS
bool
config IDE_ARCH_OBSOLETE_DEFAULTS
depends on HAVE_IDE_ARCH_OBSOLETE_DEFAULTS
And then in each arch Kconfig include:
arch/alpha/Kconfig:
config ALPHA
select HAVE_ARCH_OBSOLETE_DEFAULTS
And the same for the others.
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
@ 2008-02-14 20:55 Bartlomiej Zolnierkiewicz
2008-02-14 20:55 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-02-14 20:55 UTC (permalink / raw)
To: linux-ide; +Cc: linux-kernel
Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use
it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/Kconfig | 3 +++
drivers/ide/ide.c | 5 +++++
include/asm-alpha/ide.h | 3 ---
include/asm-ia64/ide.h | 2 --
include/asm-m32r/ide.h | 2 --
include/asm-mips/mach-generic/ide.h | 2 --
include/asm-powerpc/ide.h | 2 --
include/asm-x86/ide.h | 2 --
include/linux/ide.h | 7 -------
9 files changed, 8 insertions(+), 20 deletions(-)
Index: b/drivers/ide/Kconfig
===================================================================
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1099,6 +1099,9 @@ config BLK_DEV_IDEDMA
config IDE_ARCH_OBSOLETE_INIT
def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
+config IDE_ARCH_OBSOLETE_DEFAULTS
+ def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32
+
endif
config BLK_DEV_HD_ONLY
Index: b/drivers/ide/ide.c
===================================================================
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -167,6 +167,11 @@ static void ide_port_init_devices_data(i
}
}
+#ifndef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
+# define ide_default_io_base(index) (0)
+# define ide_default_irq(base) (0)
+# define ide_init_default_irq(base) (0)
+#endif
/*
* init_ide_data() sets reasonable default values into all fields
Index: b/include/asm-alpha/ide.h
===================================================================
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -13,9 +13,6 @@
#ifdef __KERNEL__
-
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
static inline int ide_default_irq(unsigned long base)
{
switch (base) {
Index: b/include/asm-ia64/ide.h
===================================================================
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -16,8 +16,6 @@
#include <linux/irq.h>
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
static inline int ide_default_irq(unsigned long base)
{
switch (base) {
Index: b/include/asm-m32r/ide.h
===================================================================
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -23,8 +23,6 @@
# endif
#endif
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {
Index: b/include/asm-mips/mach-generic/ide.h
===================================================================
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -27,8 +27,6 @@
# endif
#endif
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
static __inline__ int ide_probe_legacy(void)
{
#ifdef CONFIG_PCI
Index: b/include/asm-powerpc/ide.h
===================================================================
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -31,8 +31,6 @@
#include <linux/hdreg.h>
#include <linux/ioport.h>
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
/* FIXME: use ide_platform host driver */
static __inline__ int ide_default_irq(unsigned long base)
{
Index: b/include/asm-x86/ide.h
===================================================================
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -20,8 +20,6 @@
# endif
#endif
-#define IDE_ARCH_OBSOLETE_DEFAULTS
-
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {
Index: b/include/linux/ide.h
===================================================================
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -194,13 +194,6 @@ static inline void ide_std_init_ports(hw
#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS
#endif
-/* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */
-#ifndef IDE_ARCH_OBSOLETE_DEFAULTS
-# define ide_default_io_base(index) (0)
-# define ide_default_irq(base) (0)
-# define ide_init_default_irq(base) (0)
-#endif
-
/* Currently only m68k, apus and m8xx need it */
#ifndef IDE_ARCH_ACK_INTR
# define ide_ack_intr(hwif) (1)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
2008-02-14 21:24 ` Bartlomiej Zolnierkiewicz
@ 2008-02-14 21:12 ` Sam Ravnborg
0 siblings, 0 replies; 4+ messages in thread
From: Sam Ravnborg @ 2008-02-14 21:12 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel
>
> I agree but this option is meant to be only temporary to ease the cleanup
> process. We can think about the proper solution after default IDE ports
> initialization gets moved to ide_generic host driver.
Makes sense and agreed. (I hoped so - which is why I said "borderline").
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
2008-02-14 20:55 ` Sam Ravnborg
@ 2008-02-14 21:24 ` Bartlomiej Zolnierkiewicz
2008-02-14 21:12 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-02-14 21:24 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: linux-ide, linux-kernel
Hi,
On Thursday 14 February 2008, Sam Ravnborg wrote:
> Hi Bart.
>
> On Thu, Feb 14, 2008 at 09:55:50PM +0100, Bartlomiej Zolnierkiewicz wrote:
> > Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use
> > it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.
> >
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > ---
> > drivers/ide/Kconfig | 3 +++
> > drivers/ide/ide.c | 5 +++++
> > include/asm-alpha/ide.h | 3 ---
> > include/asm-ia64/ide.h | 2 --
> > include/asm-m32r/ide.h | 2 --
> > include/asm-mips/mach-generic/ide.h | 2 --
> > include/asm-powerpc/ide.h | 2 --
> > include/asm-x86/ide.h | 2 --
> > include/linux/ide.h | 7 -------
> > 9 files changed, 8 insertions(+), 20 deletions(-)
> >
> > Index: b/drivers/ide/Kconfig
> > ===================================================================
> > --- a/drivers/ide/Kconfig
> > +++ b/drivers/ide/Kconfig
> > @@ -1099,6 +1099,9 @@ config BLK_DEV_IDEDMA
> > config IDE_ARCH_OBSOLETE_INIT
> > def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
> >
> > +config IDE_ARCH_OBSOLETE_DEFAULTS
> > + def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32
> > +
> > endif
>
>
> This time it is maybe borderline as it makes sense to see a list of
> archs that uses this.
> But still I would prefer you did like this:
>
> drivers/ide/Kconfig:
>
> config HAVE_IDE_ARCH_OBSOLETE_DEFAULTS
> bool
>
> config IDE_ARCH_OBSOLETE_DEFAULTS
> depends on HAVE_IDE_ARCH_OBSOLETE_DEFAULTS
>
> And then in each arch Kconfig include:
>
> arch/alpha/Kconfig:
> config ALPHA
> select HAVE_ARCH_OBSOLETE_DEFAULTS
>
> And the same for the others.
I agree but this option is meant to be only temporary to ease the cleanup
process. We can think about the proper solution after default IDE ports
initialization gets moved to ide_generic host driver.
Thanks,
Bart
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-02-14 21:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-14 20:55 [PATCH 1/2] ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS Bartlomiej Zolnierkiewicz
2008-02-14 20:55 ` Sam Ravnborg
2008-02-14 21:24 ` Bartlomiej Zolnierkiewicz
2008-02-14 21:12 ` Sam Ravnborg
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).