From: stsp <stsp@openbsd.org>
Date: Tue, 28 Apr 2015 07:55:13 +0000 (+0000)
Subject: In rtsx(4), condense the list of support chips in a comment, remove the unused
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ae1f177a2f3feacb5598bd9ae0a392bc9008477f;p=openbsd

In rtsx(4), condense the list of support chips in a comment, remove the unused
F_5227 flag, sort PCI IDs, and fix a typo in a comment. No functional change.
from brad
---

diff --git a/sys/dev/ic/rtsx.c b/sys/dev/ic/rtsx.c
index 06fcfd5401e..38b16a4695b 100644
--- a/sys/dev/ic/rtsx.c
+++ b/sys/dev/ic/rtsx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsx.c,v 1.11 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: rtsx.c,v 1.12 2015/04/28 07:55:13 stsp Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -18,7 +18,7 @@
  */
 
 /*
- * Realtek RTS5209/RTS5227/RTS5229/RTL8402 Card Reader driver.
+ * Realtek RTS52xx/RTL84xx Card Reader driver.
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ic/rtsxvar.h b/sys/dev/ic/rtsxvar.h
index 345ead395f5..35caed92ae0 100644
--- a/sys/dev/ic/rtsxvar.h
+++ b/sys/dev/ic/rtsxvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsxvar.h,v 1.3 2014/08/19 17:55:03 phessler Exp $	*/
+/*	$OpenBSD: rtsxvar.h,v 1.4 2015/04/28 07:55:13 stsp Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -49,8 +49,7 @@ int	rtsx_intr(void *);
 #define	RTSX_F_CARD_PRESENT	0x01
 #define	RTSX_F_SDIO_SUPPORT	0x02
 #define	RTSX_F_5209		0x04
-#define	RTSX_F_5227		0x08
-#define	RTSX_F_5229		0x10
-#define	RTSX_F_5229_TYPE_C	0x20
+#define	RTSX_F_5229		0x08
+#define	RTSX_F_5229_TYPE_C	0x10
 
 #endif
diff --git a/sys/dev/pci/rtsx_pci.c b/sys/dev/pci/rtsx_pci.c
index c17517625d9..0f87e63a409 100644
--- a/sys/dev/pci/rtsx_pci.c
+++ b/sys/dev/pci/rtsx_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsx_pci.c,v 1.11 2015/03/28 18:07:56 jcs Exp $	*/
+/*	$OpenBSD: rtsx_pci.c,v 1.12 2015/04/28 07:55:13 stsp Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -48,7 +48,7 @@ rtsx_pci_match(struct device *parent, void *match, void *aux)
 	struct pci_attach_args *pa = aux;
 
 	/* 
-	 * Explicitly match the UNDEFINED device class only. Some RTS5902
+	 * Explicitly match the UNDEFINED device class only. Some RTS5209
 	 * devices advertise a SYSTEM/SDHC class in addition to the UNDEFINED
 	 * device class. Let sdhc(4) handle the SYSTEM/SDHC ones.
 	 */
@@ -60,9 +60,9 @@ rtsx_pci_match(struct device *parent, void *match, void *aux)
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTS5227 ||
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTS5229 ||
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTS5249 ||
+	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTL8402 ||
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTL8411 ||
-	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTL8411B ||
-	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTL8402)
+	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RTL8411B)
 		return 1;
 
 	return 0;
@@ -118,9 +118,6 @@ rtsx_pci_attach(struct device *parent, struct device *self, void *aux)
 		case PCI_PRODUCT_REALTEK_RTS5209:
 			flags = RTSX_F_5209;
 			break;
-		case PCI_PRODUCT_REALTEK_RTS5227:
-			flags = RTSX_F_5227;
-			break;
 		case PCI_PRODUCT_REALTEK_RTS5229:
 		case PCI_PRODUCT_REALTEK_RTS5249:
 			flags = RTSX_F_5229;