From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>,
linux-ide@vger.kernel.org
Subject: PATCH: Add fixup functionality to the PCI drivers
Date: Fri, 05 Nov 2004 16:40:44 +0000 [thread overview]
Message-ID: <1099672842.5564.56.camel@localhost.localdomain> (raw)
Using the ->fixup field that was added we propogate the fixup
functionality into PCI interfaces. The fixup needs to be in the data
structure really as interfaces may be hotplugged/unplugged [plugged only
in base kernel].
The PCI interfaces stay the same so no driver changes are needed except
to use the fixup hook.
diff --exclude-from /usr/src/exclude -u --new-file --recursive linux.vanilla-2.6.10rc1/drivers/ide/setup-pci.c linux-2.6.10rc1/drivers/ide/setup-pci.c
--- linux.vanilla-2.6.10rc1/drivers/ide/setup-pci.c 2004-11-05 15:34:46.000000000 +0000
+++ linux-2.6.10rc1/drivers/ide/setup-pci.c 2004-11-05 16:27:33.000000000 +0000
@@ -729,14 +729,26 @@
return index;
}
+/**
+ * probe_pci_hwif_init - probe the hwif then allow fixups
+ * @hwif: interface to probe
+ * @d: PCI device
+ *
+ * Perform the generic probe and if it is successful invoke any
+ * remaining post probe fixup logic in the driver itself.
+ */
+static void probe_pci_hwif_init(ide_hwif_t *hwif, ide_pci_device_t *d) {
+ probe_hwif_init_with_fixup(hwif, d->fixup);
+}
+
void ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_t *d)
{
ata_index_t index_list = do_ide_setup_pci_device(dev, d, 1);
if ((index_list.b.low & 0xf0) != 0xf0)
- probe_hwif_init(&ide_hwifs[index_list.b.low]);
+ probe_pci_hwif_init(&ide_hwifs[index_list.b.low], d);
if ((index_list.b.high & 0xf0) != 0xf0)
- probe_hwif_init(&ide_hwifs[index_list.b.high]);
+ probe_pci_hwif_init(&ide_hwifs[index_list.b.high], d);
create_proc_ide_interfaces();
}
@@ -749,13 +761,13 @@
ata_index_t index_list2 = do_ide_setup_pci_device(dev2, d, 0);
if ((index_list.b.low & 0xf0) != 0xf0)
- probe_hwif_init(&ide_hwifs[index_list.b.low]);
+ probe_pci_hwif_init(&ide_hwifs[index_list.b.low], d);
if ((index_list.b.high & 0xf0) != 0xf0)
- probe_hwif_init(&ide_hwifs[index_list.b.high]);
+ probe_pci_hwif_init(&ide_hwifs[index_list.b.high], d);
if ((index_list2.b.low & 0xf0) != 0xf0)
- probe_hwif_init(&ide_hwifs[index_list2.b.low]);
+ probe_pci_hwif_init(&ide_hwifs[index_list2.b.low], d);
if ((index_list2.b.high & 0xf0) != 0xf0)
- probe_hwif_init(&ide_hwifs[index_list2.b.high]);
+ probe_pci_hwif_init(&ide_hwifs[index_list2.b.high], d);
create_proc_ide_interfaces();
}
next reply other threads:[~2004-11-05 17:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-05 16:40 Alan Cox [this message]
2004-11-05 22:13 ` PATCH: Add fixup functionality to the PCI drivers Bartlomiej Zolnierkiewicz
2004-11-05 23:29 ` Alan Cox
2004-11-06 0:44 ` Bartlomiej Zolnierkiewicz
2004-11-05 23:43 ` Alan Cox
2004-11-06 16:05 ` 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=1099672842.5564.56.camel@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=B.Zolnierkiewicz@elka.pw.edu.pl \
--cc=linux-ide@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.