Home » Mailing list archives » linux-kernel » 2008 » June » 2

[PATCH 8/9] ide_4drives: use struct ide_port_info

!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] ide_4drives: use struct ide_port_info
Date: Monday, June 2, 2008 - 4:23 pm

Convert the driver to use struct ide_port_info - as a nice side-effect
this fixes hwif->channel initialization.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/legacy/ide-4drives.c |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

Index: b/drivers/ide/legacy/ide-4drives.c
===================================================================
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -11,6 +11,23 @@ static int probe_4drives;
 module_param_named(probe, probe_4drives, bool, 0);
 MODULE_PARM_DESC(probe, "probe for generic IDE chipset with 4 drives/port");
 
+static void ide_4drives_port_init_devs(ide_hwif_t *hwif)
+{
+	if (hwif->channel) {
+		hwif->drives[0].select.all ^= 0x20;
+		hwif->drives[1].select.all ^= 0x20;
+	}
+}
+
+static const struct ide_port_ops ide_4drives_port_ops = {
+	.port_init_devs		= ide_4drives_port_init_devs,
+};
+
+static const struct ide_port_info ide_4drives_port_info = {
+	.port_ops		= &ide_4drives_port_ops,
+	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA,
+};
+
 static int __init ide_4drives_init(void)
 {
 	ide_hwif_t *hwif, *mate;
@@ -49,18 +66,10 @@ static int __init ide_4drives_init(void)
 	mate = ide_find_port();
 	if (mate) {
 		ide_init_port_hw(mate, &hw);
-		mate->drives[0].select.all ^= 0x20;
-		mate->drives[1].select.all ^= 0x20;
 		idx[1] = mate->index;
-
-		if (hwif) {
-			hwif->mate = mate;
-			mate->mate = hwif;
-			hwif->serialized = mate->serialized = 1;
-		}
 	}
 
-	ide_device_add(idx, NULL);
+	ide_device_add(idx, &ide_4drives_port_info);
 
 	return 0;
 }
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/9] ide: fix host drivers missing hwif-&gt;chipset i..., Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:22 pm)
[PATCH 9/9] ide-cs: use struct ide_port_info, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:24 pm)
[PATCH 8/9] ide_4drives: use struct ide_port_info, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)
[PATCH 7/9] au1xxx-ide: don't use hwif-&gt;hwif_data, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)
Re: [PATCH 7/9] au1xxx-ide: don't use hwif-&gt;hwif_data, Sergei Shtylyov, (Wed Jun 4, 5:43 am)
[PATCH 6/9] delkin_cb: add missing __init/__exit tags, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)
Re: [PATCH 6/9] delkin_cb: add missing __init/__exit tags, Sergei Shtylyov, (Wed Jun 4, 5:42 am)
[PATCH 5/9] delkin_cb: add warm-plug support, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)
[PATCH 4/9] delkin_cb: use struct ide_port_info, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)
[PATCH 3/9] delkin_cb: set proper hwif-&gt;gendev.parent value, Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)
Re: [PATCH 3/9] delkin_cb: set proper hwif-&gt;gendev.parent..., Sergei Shtylyov, (Wed Jun 4, 5:41 am)
[PATCH 2/9] ide: set hwif-&gt;dev in ide_init_port_hw(), Bartlomiej Zolnierkiewicz..., (Mon Jun 2, 4:23 pm)