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

[PATCH 4/9] delkin_cb: 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 4/9] delkin_cb: 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 racy setup of ->io_32bit/unmask settings (after ide_device_add()
call device can be already in use).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/pci/delkin_cb.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Index: b/drivers/ide/pci/delkin_cb.c
===================================================================
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -47,13 +47,18 @@ static const struct ide_port_ops delkin_
 	.quirkproc		= ide_undecoded_slave,
 };
 
+static const struct ide_port_info delkin_cb_port_info = {
+	.port_ops		= &delkin_cb_port_ops,
+	.host_flags		= IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
+				  IDE_HFLAG_NO_DMA,
+};
+
 static int __devinit
 delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 {
 	unsigned long base;
 	hw_regs_t hw;
 	ide_hwif_t *hwif = NULL;
-	ide_drive_t *drive;
 	int i, rc;
 	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
@@ -89,22 +94,16 @@ delkin_cb_probe (struct pci_dev *dev, co
 	i = hwif->index;
 
 	ide_init_port_hw(hwif, &hw);
-	hwif->port_ops = &delkin_cb_port_ops;
 
 	idx[0] = i;
 
-	ide_device_add(idx, NULL);
+	ide_device_add(idx, &delkin_cb_port_info);
 
 	if (!hwif->present)
 		goto out_disable;
 
 	pci_set_drvdata(dev, hwif);
 
-	drive = &hwif->drives[0];
-	if (drive->present) {
-		drive->io_32bit = 1;
-		drive->unmask   = 1;
-	}
 	return 0;
 
 out_disable:
--
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)