ide-generic: minor fix for mips

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jul 7, 2008 libata

Share & tools

Bartlomiej Zolnierkiewicz

author

2008-07-07 22:00 UTC #0 lore raw

PATCH 3/10 ide-generic: minor fix for mips

Move ide_probe_legacy() call to ide_generic_init() so it fails early if necessary and returns the proper error value (nowadays ide_default_io_base() is used only by ide-generic).

Cc Ralf Baechle <[email protected]>

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/ide-generic.c           |    4 ++++
 include/asm-mips/mach-generic/ide.h |    2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

drivers/ide/ide-generic.c +4 -0

Index: b/drivers/ide/ide-generic.c
===================================================================
@@ -87,6 +87,10 @@ static int __init ide_generic_init(void)
 	unsigned long io_addr;
 	int i, rc;
 
+#ifdef CONFIG_MIPS
+	if (!ide_probe_legacy())
+		return -ENODEV;
+#endif
 	printk(KERN_INFO DRV_NAME ": please use \"probe_mask=0x3f\" module "
 			 "parameter for probing all legacy ISA IDE ports\n");

include/asm-mips/mach-generic/ide.h +0 -2

Index: b/include/asm-mips/mach-generic/ide.h
===================================================================
@@ -72,8 +72,6 @@ static __inline__ int ide_default_irq(un
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-	if (!ide_probe_legacy())
-		return 0;
 	/*
 	 *      If PCI is present then it is not safe to poke around
 	 *      the other legacy IDE ports. Only 0x1f0 and 0x170 are