From b7168b7ad5b2b4bf9b093932fce1d49605e1526f Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@cvs.openbsd.org>
Date: Sun, 12 Mar 2006 17:44:08 +0000
Subject: Make use of pci_matchbyid().

---
 sys/dev/pci/if_pcn.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 1094047196f..e1b03d47ac5 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pcn.c,v 1.7 2006/03/12 17:29:48 martin Exp $	*/
+/*	$OpenBSD: if_pcn.c,v 1.8 2006/03/12 17:44:07 brad Exp $	*/
 /*	$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $	*/
 
 /*
@@ -446,6 +446,11 @@ struct cfattach pcn_ca = {
 	sizeof(struct pcn_softc), pcn_match, pcn_attach,
 };
 
+const struct pci_matchid pcn_devices[] = {
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCNET_PCI },
+	{ PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCHOME_PCI }
+};
+
 struct cfdriver pcn_cd = {
 	0, "pcn", DV_IFNET
 };
@@ -519,15 +524,8 @@ pcn_match(struct device *parent, void *match, void *aux)
 	    PCI_CLASS(pa->pa_class) == PCI_CLASS_NETWORK)
 		return(1);
 
-	if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_AMD)
-		return (0);
-
-	switch (PCI_PRODUCT(pa->pa_id)) {
-	case PCI_PRODUCT_AMD_PCNET_PCI:
-		return (1);
-	}
-
-	return (0);
+	return (pci_matchbyid((struct pci_attach_args *)aux, pcn_devices,
+	    sizeof(pcn_devices)/sizeof(pcn_devices[0])));
 }
 
 void
-- 
cgit v1.2.3