From 86fd88736fe7b4044ee31715dca3b25ffd7f2435 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 3 Dec 2014 00:47:05 +0000 Subject: [PATCH] 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. --- sys/dev/pccard/pccardvar.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index ca0cd8abace0..bef4a7c86eba 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -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