lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qd65xx: cleanup qd_probe()

Browse Source 
* Replace 'if ()'-s by 'switch ()' block.

* Merge common code for QD6500/QD6580A/QD6580B.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-04-26 22:25:16 +02:00
parent 0bfeee7d41
commit 7a2199f341
1 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/ide/legacy/qd65xx.c
View File

@@ -334,7 +334,7 @@ static const struct ide_port_info qd65xx_port_info __initdata = {
static int __init qd_probe(int base) static int __init qd_probe(int base)
{ {
int rc; int rc;
u8 config, unit; u8 config, unit, control;
struct ide_port_info d = qd65xx_port_info; struct ide_port_info d = qd65xx_port_info;
config = inb(QD_CONFIG_PORT); config = inb(QD_CONFIG_PORT);
@@ -347,13 +347,11 @@ static int __init qd_probe(int base)
if (unit) if (unit)
d.host_flags |= IDE_HFLAG_QD_2ND_PORT; d.host_flags |= IDE_HFLAG_QD_2ND_PORT;
if ((config & 0xf0) == QD_CONFIG_QD6500) { switch (config & 0xf0) {
case QD_CONFIG_QD6500:
if (qd_testreg(base)) if (qd_testreg(base))
return -ENODEV; /* bad register */ return -ENODEV; /* bad register */
/* qd6500 found */
if (config & QD_CONFIG_DISABLED) { if (config & QD_CONFIG_DISABLED) {
printk(KERN_WARNING "qd6500 is disabled !\n"); printk(KERN_WARNING "qd6500 is disabled !\n");
return -ENODEV; return -ENODEV;
@@ -365,22 +363,12 @@ static int __init qd_probe(int base)
d.port_ops = &qd6500_port_ops; d.port_ops = &qd6500_port_ops;
d.host_flags |= IDE_HFLAG_SINGLE; d.host_flags |= IDE_HFLAG_SINGLE;
break;
rc = ide_legacy_device_add(&d, (base << 8) | config); case QD_CONFIG_QD6580_A:
case QD_CONFIG_QD6580_B:
return (rc == 0) ? 1 : rc;
}
if (((config & 0xf0) == QD_CONFIG_QD6580_A) ||
((config & 0xf0) == QD_CONFIG_QD6580_B)) {
u8 control;
if (qd_testreg(base) || qd_testreg(base + 0x02)) if (qd_testreg(base) || qd_testreg(base + 0x02))
return -ENODEV; /* bad registers */ return -ENODEV; /* bad registers */
/* qd6580 found */
control = inb(QD_CONTROL_PORT); control = inb(QD_CONTROL_PORT);
printk(KERN_NOTICE "qd6580 at %#x\n", base); printk(KERN_NOTICE "qd6580 at %#x\n", base);
@@ -390,28 +378,22 @@ static int __init qd_probe(int base)
outb(QD_DEF_CONTR, QD_CONTROL_PORT); outb(QD_DEF_CONTR, QD_CONTROL_PORT);
d.port_ops = &qd6580_port_ops; d.port_ops = &qd6580_port_ops;
if (control & QD_CONTR_SEC_DISABLED)
if (control & QD_CONTR_SEC_DISABLED) {
/* secondary disabled */
printk(KERN_INFO "qd6580: single IDE board\n");
d.host_flags |= IDE_HFLAG_SINGLE; d.host_flags |= IDE_HFLAG_SINGLE;
rc = ide_legacy_device_add(&d, (base << 8) | config); printk(KERN_INFO "qd6580: %s IDE board\n",
(control & QD_CONTR_SEC_DISABLED) ? "single" : "dual");
return (rc == 0) ? 1 : rc; break;
} else { default:
/* secondary enabled */ return -ENODEV;
printk(KERN_INFO "qd6580: dual IDE board\n");
rc = ide_legacy_device_add(&d, (base << 8) | config);
return rc; /* no other qd65xx possible */
}
} }
/* no qd65xx found */
return -ENODEV; rc = ide_legacy_device_add(&d, (base << 8) | config);
if (d.host_flags & IDE_HFLAG_SINGLE)
return (rc == 0) ? 1 : rc;
return rc;
} }
int probe_qd65xx = 0; int probe_qd65xx = 0;