diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-02-10 12:14:54 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-02-10 12:14:54 +0000 |
| commit | 5538aad5ce8be1515b9f08e298987419f4465d77 (patch) | |
| tree | 836c2ff5f7ea050c92351c221adea2c2b284b4cb | |
| parent | 84a7dc7683a5d38e4999855972890e3f37a8cf29 (diff) | |
Remove redundant product name strings, simplify matching slightly.
| -rw-r--r-- | sys/dev/cardbus/if_rtw_cardbus.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index dc2c9219f74..92ed6c4baf4 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_cardbus.c,v 1.3 2005/02/09 22:08:29 jsg Exp $ */ +/* $OpenBSD: if_rtw_cardbus.c,v 1.4 2005/02/10 12:14:53 jsg Exp $ */ /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */ /*- @@ -172,18 +172,11 @@ const struct rtw_cardbus_product *rtw_cardbus_lookup( const struct rtw_cardbus_product { u_int32_t rcp_vendor; /* PCI vendor ID */ u_int32_t rcp_product; /* PCI product ID */ - const char *rcp_product_name; } rtw_cardbus_products[] = { - { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8180, - "Realtek RTL8180 802.11 MAC/BBP" }, - - { PCI_VENDOR_BELKIN2, PCI_PRODUCT_BELKIN2_F5D6020V3, - "Belkin F5D6020v3 802.11b (RTL8180 MAC/BBP)" }, - - { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DWL610, - "D-Link DWL-610" }, - - { 0, 0, NULL }, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8180 }, + { PCI_VENDOR_BELKIN2, PCI_PRODUCT_BELKIN2_F5D6020V3 }, + { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DWL610 }, + { 0, 0 } }; const struct rtw_cardbus_product * @@ -191,9 +184,7 @@ rtw_cardbus_lookup(const struct cardbus_attach_args *ca) { const struct rtw_cardbus_product *rcp; - for (rcp = rtw_cardbus_products; - rcp->rcp_product_name != NULL; - rcp++) { + for (rcp = rtw_cardbus_products; rcp->rcp_product != 0; rcp++) { if (PCI_VENDOR(ca->ca_id) == rcp->rcp_vendor && PCI_PRODUCT(ca->ca_id) == rcp->rcp_product) return (rcp); @@ -206,10 +197,7 @@ rtw_cardbus_match(struct device *parent, void *match, void *aux) { struct cardbus_attach_args *ca = aux; - if (rtw_cardbus_lookup(ca) != NULL) - return (1); - - return (0); + return (rtw_cardbus_lookup(ca) != NULL); } void |