From 14140c65a357c1fa7ed08a1b314c179ce9e9e279 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 22 Nov 2006 18:26:19 +1100
Subject: [PATCH] --- yaml --- r: 44811 b: refs/heads/master c:
 120a50df4536da69d2e85633a60bc40a85088dd1 h: refs/heads/master i:   44809:
 98fada540aeab1e06072035f9045130e69254d16   44807:
 cb5864ae9ef8c4210b756e72d40d23d1a112bf87 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pci/htirq.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4e7d99f5af9b..a15ec082281b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 687d5fe3dc33794efb500f42164a0588e2647914
+refs/heads/master: 120a50df4536da69d2e85633a60bc40a85088dd1
diff --git a/trunk/drivers/pci/htirq.c b/trunk/drivers/pci/htirq.c
index 0a8d1cce9fa0..279c940a0039 100644
--- a/trunk/drivers/pci/htirq.c
+++ b/trunk/drivers/pci/htirq.c
@@ -99,14 +99,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
 	int pos;
 	int irq;
 
-	pos = pci_find_capability(dev, PCI_CAP_ID_HT);
-	while (pos) {
-		u8 subtype;
-		pci_read_config_byte(dev, pos + 3, &subtype);
-		if (subtype == HT_CAPTYPE_IRQ)
-			break;
-		pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT);
-	}
+	pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ);
 	if (!pos)
 		return -EINVAL;