Home » Mailing list archives » linux-kernel » 2008 » February » 16

[PATCH 8/9] qd65xx: return error value in qd_probe()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Bartlomiej Zolnierkiewicz <bzolnier@...>
To: <linux-ide@...>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@...>, <linux-kernel@...>
Subject: [PATCH 8/9] qd65xx: return error value in qd_probe()
Date: Saturday, February 16, 2008 - 4:27 pm

Return error value in qd_probe() and use it in qd65xx_init()
instead of checking ide_hwifs[].chipset.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/legacy/qd65xx.c |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Index: b/drivers/ide/legacy/qd65xx.c
===================================================================
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -396,7 +396,7 @@ static int __init qd_probe(int base)
 	config = inb(QD_CONFIG_PORT);
 
 	if (! ((config & QD_CONFIG_BASEPORT) >> 1 == (base == 0xb0)) )
-		return 1;
+		return -ENODEV;
 
 	unit = ! (config & QD_CONFIG_IDE_BASEPORT);
 
@@ -410,7 +410,8 @@ static int __init qd_probe(int base)
 
 	if ((config & 0xf0) == QD_CONFIG_QD6500) {
 
-		if (qd_testreg(base)) return 1;		/* bad register */
+		if (qd_testreg(base))
+			 return -ENODEV;	/* bad register */
 
 		/* qd6500 found */
 
@@ -421,7 +422,7 @@ static int __init qd_probe(int base)
 		
 		if (config & QD_CONFIG_DISABLED) {
 			printk(KERN_WARNING "qd6500 is disabled !\n");
-			return 1;
+			return -ENODEV;
 		}
 
 		ide_init_port_hw(hwif, &hw[unit]);
@@ -443,8 +444,8 @@ static int __init qd_probe(int base)
 
 		u8 control;
 
-		if (qd_testreg(base) || qd_testreg(base+0x02)) return 1;
-			/* bad registers */
+		if (qd_testreg(base) || qd_testreg(base + 0x02))
+			return -ENODEV;	/* bad registers */
 
 		/* qd6580 found */
 
@@ -508,7 +509,7 @@ static int __init qd_probe(int base)
 		}
 	}
 	/* no qd65xx found */
-	return 1;
+	return -ENODEV;
 }
 
 int probe_qd65xx = 0;
@@ -518,14 +519,18 @@ MODULE_PARM_DESC(probe, "probe for QD65x
 
 static int __init qd65xx_init(void)
 {
+	int rc1, rc2 = -ENODEV;
+
 	if (probe_qd65xx == 0)
 		return -ENODEV;
 
-	if (qd_probe(0x30))
-		qd_probe(0xb0);
-	if (ide_hwifs[0].chipset != ide_qd65xx &&
-	    ide_hwifs[1].chipset != ide_qd65xx)
+	rc1 = qd_probe(0x30);
+	if (rc1)
+		rc2 = qd_probe(0xb0);
+
+	if (rc1 < 0 && rc2 < 0)
 		return -ENODEV;
+
 	return 0;
 }
 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/9] sgiioc4: use ide_find_port(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:26 pm)
[PATCH 9/9] ide: IDE_HFLAG_BOOTABLE -&gt; IDE_HFLAG_NON_BOOTABLE, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:27 pm)
[PATCH 8/9] qd65xx: return error value in qd_probe(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:27 pm)
Re: [PATCH 8/9] qd65xx: return error value in qd_probe(), Sergei Shtylyov, (Mon Feb 18, 1:00 pm)
[PATCH 7/9] ht6560b: use driver name for resource allocation, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:27 pm)
Re: [PATCH 7/9] ht6560b: use driver name for resource alloca..., Sergei Shtylyov, (Mon Feb 18, 11:24 am)
[PATCH 6/9] umc8672: don't use ide_hwifs[] in umc_set_pio_mo..., Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:27 pm)
[PATCH 5/9] scc_pata: store 'hwif' pointer in struct scc_ports, Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:27 pm)
[PATCH 4/9] cmd640: use ide_find_port(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:26 pm)
[PATCH 3/9] cmd640: remove cmd_drives[], Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:26 pm)
[PATCH 2/9] au1xxx-ide: use ide_find_port(), Bartlomiej Zolnierkiewicz..., (Sat Feb 16, 4:26 pm)