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

[PATCH 5/9] scc_pata: store 'hwif' pointer in struct scc_ports

!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 5/9] scc_pata: store 'hwif' pointer in struct scc_ports
Date: Saturday, February 16, 2008 - 4:27 pm

Replace 'unsigned char hwif_id' by 'ide_hwif_t *hwif' in struct scc_ports.
This allows us to remove ide_hwifs[] usage from scc_remove().

There should be no functional changes caused by this patch.

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

Index: b/drivers/ide/pci/scc_pata.c
===================================================================
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -65,7 +65,7 @@
 
 static struct scc_ports {
 	unsigned long ctl, dma;
-	unsigned char hwif_id;  /* for removing hwif from system */
+	ide_hwif_t *hwif;  /* for removing port from system */
 } scc_ports[MAX_HWIFS];
 
 /* PIO transfer mode  table */
@@ -664,7 +664,7 @@ static void __devinit init_hwif_scc(ide_
 {
 	struct scc_ports *ports = ide_get_hwifdata(hwif);
 
-	ports->hwif_id = hwif->index;
+	ports->hwif = hwif;
 
 	hwif->dma_command = hwif->dma_base;
 	hwif->dma_status = hwif->dma_base + 0x04;
@@ -726,7 +726,7 @@ static int __devinit scc_init_one(struct
 static void __devexit scc_remove(struct pci_dev *dev)
 {
 	struct scc_ports *ports = pci_get_drvdata(dev);
-	ide_hwif_t *hwif = &ide_hwifs[ports->hwif_id];
+	ide_hwif_t *hwif = ports->hwif;
 	unsigned long ctl_base = pci_resource_start(dev, 0);
 	unsigned long dma_base = pci_resource_start(dev, 1);
 	unsigned long ctl_size = pci_resource_len(dev, 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)