From owner-svn-src-all@FreeBSD.ORG  Wed Dec  3 00:47:06 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EF526EF;
 Wed,  3 Dec 2014 00:47:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2BDBADCF;
 Wed,  3 Dec 2014 00:47:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB30l6Rh052953;
 Wed, 3 Dec 2014 00:47:06 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB30l6Bh052952;
 Wed, 3 Dec 2014 00:47:06 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201412030047.sB30l6Bh052952@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 3 Dec 2014 00:47:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275434 - head/sys/dev/pccard
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Dec 2014 00:47:06 -0000

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