svn commit: r275434 - head/sys/dev/pccard

[Warner Losh]

Author: imp
Date: Wed Dec  3 00:47:05 2014
New Revision: 275434
URL: https://svnweb.freebsd.org/changeset/base/275434

Log:
  Remove unused PCMCIA_CARD* macros.
  
  Always include the card human readable name. We support ~270 cards and
  at ~20 bytes each, this bloats things by only ~5k. Retain the
  PCMCIA_CARD vs PCMCIA_CARD_D distinction, though, in case this is
  intolerable.

Modified:
  head/sys/dev/pccard/pccardvar.h

Modified: head/sys/dev/pccard/pccardvar.h
==============================================================================
--- head/sys/dev/pccard/pccardvar.h	Tue Dec  2 23:33:37 2014	(r275433)
+++ head/sys/dev/pccard/pccardvar.h	Wed Dec  3 00:47:05 2014	(r275434)
@@ -219,14 +219,8 @@ enum {
 #define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b
 #define PCMCIA_CARD_D(v, p) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
 		PCCARD_P(v, p), PCCARD_C(v, p) }
-#define PCMCIA_CARD2_D(v1, p1, p2) \
-		{ PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
-		  PCMCIA_CIS_ ## p2}
-#define PCMCIA_CARD(v, p) { NULL, PCMCIA_VENDOR_ ## v, \
+#define PCMCIA_CARD(v, p) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
 		PCCARD_P(v, p), PCCARD_C(v, p) }
-#define PCMCIA_CARD2(v1, p1, p2) \
-		{ NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
-		  PCMCIA_CIS_ ## p2}
 
 /*
  * Defines to decode the get_funce_disk return value.  See the PCMCIA standard