Commit 0e33555f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2) 



* Add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS to drivers/ide/Kconfig and use
  it instead of defining IDE_ARCH_OBSOLETE_DEFAULTS in <arch/ide.h>.

v2:
* Define ide_default_irq() in ide-probe.c/ns87415.c if not already defined
  and drop defining ide_default_irq() for CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=n.

  [ Thanks to Stephen Rothwell and David Miller for noticing the problem. ]

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 359c2e2d

drivers/ide/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,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

drivers/ide/ide-probe.c

+4 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,10 @@ static void drive_release_dev (struct device *dev) 
	complete(&drive->gendev_rel_comp);

}



#ifndef ide_default_irq

#define ide_default_irq(irq) 0

#endif



static int hwif_init(ide_hwif_t *hwif)

{

	int old_irq;

drivers/ide/ide.c

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif) 
	}

}



#ifndef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS

# define ide_default_io_base(index)	(0)

# define ide_init_default_irq(base)	(0)

#endif



/*

 * init_ide_data() sets reasonable default values into all fields

drivers/ide/pci/ns87415.c

+4 −0
Original line number Diff line number Diff line
@@ -181,6 +181,10 @@ static int ns87415_ide_dma_setup(ide_drive_t *drive) 
	return 1;

}



#ifndef ide_default_irq

#define ide_default_irq(irq) 0

#endif



static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);

include/asm-alpha/ide.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 


#ifdef __KERNEL__





#define IDE_ARCH_OBSOLETE_DEFAULTS



static inline int ide_default_irq(unsigned long base)

{

	switch (base) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE