All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 5/9] scc_pata: store 'hwif' pointer in struct scc_ports
Date: Sat, 16 Feb 2008 21:27:01 +0100	[thread overview]
Message-ID: <20080216202701.25536.54484.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20080216202634.25536.78915.sendpatchset@localhost.localdomain>

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);

  parent reply	other threads:[~2008-02-16 20:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-16 20:26 [PATCH 1/9] sgiioc4: use ide_find_port() Bartlomiej Zolnierkiewicz
2008-02-16 20:26 ` [PATCH 2/9] au1xxx-ide: " Bartlomiej Zolnierkiewicz
2008-02-16 20:26 ` [PATCH 3/9] cmd640: remove cmd_drives[] Bartlomiej Zolnierkiewicz
2008-02-16 20:26 ` [PATCH 4/9] cmd640: use ide_find_port() Bartlomiej Zolnierkiewicz
2008-02-16 20:27 ` Bartlomiej Zolnierkiewicz [this message]
2008-02-16 20:27 ` [PATCH 6/9] umc8672: don't use ide_hwifs[] in umc_set_pio_mode() Bartlomiej Zolnierkiewicz
2008-02-16 20:27 ` [PATCH 7/9] ht6560b: use driver name for resource allocation Bartlomiej Zolnierkiewicz
2008-02-18 15:24   ` Sergei Shtylyov
2008-02-16 20:27 ` [PATCH 8/9] qd65xx: return error value in qd_probe() Bartlomiej Zolnierkiewicz
2008-02-18 17:00   ` Sergei Shtylyov
2008-02-16 20:27 ` [PATCH 9/9] ide: IDE_HFLAG_BOOTABLE -> IDE_HFLAG_NON_BOOTABLE Bartlomiej Zolnierkiewicz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080216202701.25536.54484.sendpatchset@localhost.localdomain \
    --to=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.