From 8de6defd16b16cd176ea2e9bec568303a04d4df6 Mon Sep 17 00:00:00 2001 From: Kai Germaschewski Date: Thu, 6 Mar 2003 13:20:29 -0600 Subject: [PATCH] ISDN/HiSax: Get rid of CARD_* defines hisax.h defined a CARD_* macro for each CONFIG option, which is totally unnecessary, just use the CONFIG option directly. --- drivers/isdn/hisax/config.c | 149 +++++++------------------------ drivers/isdn/hisax/hisax.h | 171 ------------------------------------ 2 files changed, 30 insertions(+), 290 deletions(-) diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 32f3822a0333a..d22229fb61db2 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -490,125 +490,36 @@ static int __init HiSax_setup(char *line) __setup("hisax=", HiSax_setup); #endif /* MODULES */ -#if CARD_TELES0 extern int setup_teles0(struct IsdnCard *card); -#endif - -#if CARD_TELES3 extern int setup_teles3(struct IsdnCard *card); -#endif - -#if CARD_S0BOX extern int setup_s0box(struct IsdnCard *card); -#endif - -#if CARD_TELESPCI extern int setup_telespci(struct IsdnCard *card); -#endif - -#if CARD_AVM_A1 extern int setup_avm_a1(struct IsdnCard *card); -#endif - -#if CARD_AVM_A1_PCMCIA extern int setup_avm_a1_pcmcia(struct IsdnCard *card); -#endif - -#if CARD_FRITZPCI extern int setup_avm_pcipnp(struct IsdnCard *card); -#endif - -#if CARD_ELSA extern int setup_elsa(struct IsdnCard *card); -#endif - -#if CARD_IX1MICROR2 extern int setup_ix1micro(struct IsdnCard *card); -#endif - -#if CARD_DIEHLDIVA extern int setup_diva(struct IsdnCard *card); -#endif - -#if CARD_ASUSCOM extern int setup_asuscom(struct IsdnCard *card); -#endif - -#if CARD_TELEINT extern int setup_TeleInt(struct IsdnCard *card); -#endif - -#if CARD_SEDLBAUER extern int setup_sedlbauer(struct IsdnCard *card); -#endif - -#if CARD_SPORTSTER extern int setup_sportster(struct IsdnCard *card); -#endif - -#if CARD_MIC extern int setup_mic(struct IsdnCard *card); -#endif - -#if CARD_NETJET_S extern int setup_netjet_s(struct IsdnCard *card); -#endif - -#if CARD_HFCS extern int setup_hfcs(struct IsdnCard *card); -#endif - -#if CARD_HFC_PCI extern int setup_hfcpci(struct IsdnCard *card); -#endif - -#if CARD_HFC_SX extern int setup_hfcsx(struct IsdnCard *card); -#endif - -#if CARD_AMD7930 extern int setup_amd7930(struct IsdnCard *card); -#endif - -#if CARD_NICCY extern int setup_niccy(struct IsdnCard *card); -#endif - -#if CARD_ISURF extern int setup_isurf(struct IsdnCard *card); -#endif - -#if CARD_HSTSAPHIR extern int setup_saphir(struct IsdnCard *card); -#endif - -#if CARD_TESTEMU extern int setup_testemu(struct IsdnCard *card); -#endif - -#if CARD_BKM_A4T extern int setup_bkm_a4t(struct IsdnCard *card); -#endif - -#if CARD_SCT_QUADRO extern int setup_sct_quadro(struct IsdnCard *card); -#endif - -#if CARD_GAZEL extern int setup_gazel(struct IsdnCard *card); -#endif - -#if CARD_W6692 extern int setup_w6692(struct IsdnCard *card); -#endif - -#if CARD_NETJET_U extern int setup_netjet_u(struct IsdnCard *card); -#endif - -#if CARD_FN_ENTERNOW_PCI extern int setup_enternow_pci(struct IsdnCard *card); -#endif /* * Find card with given driverId @@ -1014,13 +925,13 @@ static int __devinit checkcard(int cardnr, char *id, int *busy_flag) (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : "NONE", cs->iif.id, cs->myid); switch (card->typ) { -#if CARD_TELES0 +#ifdef CONFIG_HISAX_16_0 case ISDN_CTYPE_16_0: case ISDN_CTYPE_8_0: ret = setup_teles0(card); break; #endif -#if CARD_TELES3 +#ifdef CONFIG_HISAX_16_3 case ISDN_CTYPE_16_3: case ISDN_CTYPE_PNP: case ISDN_CTYPE_TELESPCMCIA: @@ -1028,32 +939,32 @@ static int __devinit checkcard(int cardnr, char *id, int *busy_flag) ret = setup_teles3(card); break; #endif -#if CARD_S0BOX +#ifdef CONFIG_HISAX_S0BOX case ISDN_CTYPE_S0BOX: ret = setup_s0box(card); break; #endif -#if CARD_TELESPCI +#ifdef CONFIG_HISAX_TELESPCI case ISDN_CTYPE_TELESPCI: ret = setup_telespci(card); break; #endif -#if CARD_AVM_A1 +#ifdef CONFIG_HISAX_AVM_A1 case ISDN_CTYPE_A1: ret = setup_avm_a1(card); break; #endif -#if CARD_AVM_A1_PCMCIA +#ifdef CONFIG_HISAX_AVM_A1_PCMCIA case ISDN_CTYPE_A1_PCMCIA: ret = setup_avm_a1_pcmcia(card); break; #endif -#if CARD_FRITZPCI +#ifdef CONFIG_HISAX_FRITZPCI case ISDN_CTYPE_FRITZPCI: ret = setup_avm_pcipnp(card); break; #endif -#if CARD_ELSA +#ifdef CONFIG_HISAX_ELSA case ISDN_CTYPE_ELSA: case ISDN_CTYPE_ELSA_PNP: case ISDN_CTYPE_ELSA_PCMCIA: @@ -1061,115 +972,115 @@ static int __devinit checkcard(int cardnr, char *id, int *busy_flag) ret = setup_elsa(card); break; #endif -#if CARD_IX1MICROR2 +#ifdef CONFIG_HISAX_IX1MICROR2 case ISDN_CTYPE_IX1MICROR2: ret = setup_ix1micro(card); break; #endif -#if CARD_DIEHLDIVA +#ifdef CONFIG_HISAX_DIEHLDIVA case ISDN_CTYPE_DIEHLDIVA: ret = setup_diva(card); break; #endif -#if CARD_ASUSCOM +#ifdef CONFIG_HISAX_ASUSCOM case ISDN_CTYPE_ASUSCOM: ret = setup_asuscom(card); break; #endif -#if CARD_TELEINT +#ifdef CONFIG_HISAX_TELEINT case ISDN_CTYPE_TELEINT: ret = setup_TeleInt(card); break; #endif -#if CARD_SEDLBAUER +#ifdef CONFIG_HISAX_SEDLBAUER case ISDN_CTYPE_SEDLBAUER: case ISDN_CTYPE_SEDLBAUER_PCMCIA: case ISDN_CTYPE_SEDLBAUER_FAX: ret = setup_sedlbauer(card); break; #endif -#if CARD_SPORTSTER +#ifdef CONFIG_HISAX_SPORTSTER case ISDN_CTYPE_SPORTSTER: ret = setup_sportster(card); break; #endif -#if CARD_MIC +#ifdef CONFIG_HISAX_MIC case ISDN_CTYPE_MIC: ret = setup_mic(card); break; #endif -#if CARD_NETJET_S +#ifdef CONFIG_HISAX_NETJET case ISDN_CTYPE_NETJET_S: ret = setup_netjet_s(card); break; #endif -#if CARD_HFCS +#ifdef CONFIG_HISAX_HFCS case ISDN_CTYPE_TELES3C: case ISDN_CTYPE_ACERP10: ret = setup_hfcs(card); break; #endif -#if CARD_HFC_PCI +#ifdef CONFIG_HISAX_HFC_PCI case ISDN_CTYPE_HFC_PCI: ret = setup_hfcpci(card); break; #endif -#if CARD_HFC_SX +#ifdef CONFIG_HISAX_HFC_SX case ISDN_CTYPE_HFC_SX: ret = setup_hfcsx(card); break; #endif -#if CARD_NICCY +#ifdef CONFIG_HISAX_NICCY case ISDN_CTYPE_NICCY: ret = setup_niccy(card); break; #endif -#if CARD_AMD7930 +#ifdef CONFIG_HISAX_AMD7930 case ISDN_CTYPE_AMD7930: ret = setup_amd7930(card); break; #endif -#if CARD_ISURF +#ifdef CONFIG_HISAX_ISURF case ISDN_CTYPE_ISURF: ret = setup_isurf(card); break; #endif -#if CARD_HSTSAPHIR +#ifdef CONFIG_HISAX_HSTSAPHIR case ISDN_CTYPE_HSTSAPHIR: ret = setup_saphir(card); break; #endif -#if CARD_TESTEMU +#ifdef CONFIG_HISAX_TESTEMU case ISDN_CTYPE_TESTEMU: ret = setup_testemu(card); break; #endif -#if CARD_BKM_A4T +#ifdef CONFIG_HISAX_BKM_A4T case ISDN_CTYPE_BKM_A4T: ret = setup_bkm_a4t(card); break; #endif -#if CARD_SCT_QUADRO +#ifdef CONFIG_HISAX_SCT_QUADRO case ISDN_CTYPE_SCT_QUADRO: ret = setup_sct_quadro(card); break; #endif -#if CARD_GAZEL +#ifdef CONFIG_HISAX_GAZEL case ISDN_CTYPE_GAZEL: ret = setup_gazel(card); break; #endif -#if CARD_W6692 +#ifdef CONFIG_HISAX_W6692 case ISDN_CTYPE_W6692: ret = setup_w6692(card); break; #endif -#if CARD_NETJET_U +#ifdef CONFIG_HISAX_NETJET_U case ISDN_CTYPE_NETJET_U: ret = setup_netjet_u(card); break; #endif -#if CARD_FN_ENTERNOW_PCI +#ifdef CONFIG_HISAX_ENTERNOW_PCI case ISDN_CTYPE_ENTERNOW: ret = setup_enternow_pci(card); break; diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index dd8d6462f41cc..ad87de176bc7e 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1072,188 +1072,17 @@ hisax_release_resources(struct IsdnCardState *cs); #define ISDN_CTYPE_COUNT 41 -#ifdef CONFIG_HISAX_16_0 -#define CARD_TELES0 1 -#else -#define CARD_TELES0 0 -#endif - -#ifdef CONFIG_HISAX_16_3 -#define CARD_TELES3 1 -#else -#define CARD_TELES3 0 -#endif - -#ifdef CONFIG_HISAX_TELESPCI -#define CARD_TELESPCI 1 -#else -#define CARD_TELESPCI 0 -#endif - -#ifdef CONFIG_HISAX_AVM_A1 -#define CARD_AVM_A1 1 -#else -#define CARD_AVM_A1 0 -#endif - -#ifdef CONFIG_HISAX_AVM_A1_PCMCIA -#define CARD_AVM_A1_PCMCIA 1 -#else -#define CARD_AVM_A1_PCMCIA 0 -#endif - -#ifdef CONFIG_HISAX_FRITZPCI -#define CARD_FRITZPCI 1 -#else -#define CARD_FRITZPCI 0 -#endif - -#ifdef CONFIG_HISAX_ELSA -#define CARD_ELSA 1 -#else -#define CARD_ELSA 0 -#endif - -#ifdef CONFIG_HISAX_IX1MICROR2 -#define CARD_IX1MICROR2 1 -#else -#define CARD_IX1MICROR2 0 -#endif - -#ifdef CONFIG_HISAX_DIEHLDIVA -#define CARD_DIEHLDIVA 1 -#else -#define CARD_DIEHLDIVA 0 -#endif - -#ifdef CONFIG_HISAX_ASUSCOM -#define CARD_ASUSCOM 1 -#else -#define CARD_ASUSCOM 0 -#endif - -#ifdef CONFIG_HISAX_TELEINT -#define CARD_TELEINT 1 -#else -#define CARD_TELEINT 0 -#endif - -#ifdef CONFIG_HISAX_SEDLBAUER -#define CARD_SEDLBAUER 1 -#else -#define CARD_SEDLBAUER 0 -#endif - -#ifdef CONFIG_HISAX_SPORTSTER -#define CARD_SPORTSTER 1 -#else -#define CARD_SPORTSTER 0 -#endif - -#ifdef CONFIG_HISAX_MIC -#define CARD_MIC 1 -#else -#define CARD_MIC 0 -#endif - -#ifdef CONFIG_HISAX_NETJET -#define CARD_NETJET_S 1 -#else -#define CARD_NETJET_S 0 -#endif - -#ifdef CONFIG_HISAX_HFCS -#define CARD_HFCS 1 -#else -#define CARD_HFCS 0 -#endif - -#ifdef CONFIG_HISAX_HFC_PCI -#define CARD_HFC_PCI 1 -#else -#define CARD_HFC_PCI 0 -#endif - -#ifdef CONFIG_HISAX_HFC_SX -#define CARD_HFC_SX 1 -#else -#define CARD_HFC_SX 0 -#endif - -#ifdef CONFIG_HISAX_AMD7930 -#define CARD_AMD7930 1 -#else -#define CARD_AMD7930 0 -#endif - -#ifdef CONFIG_HISAX_NICCY -#define CARD_NICCY 1 -#else -#define CARD_NICCY 0 -#endif - -#ifdef CONFIG_HISAX_ISURF -#define CARD_ISURF 1 -#else -#define CARD_ISURF 0 -#endif - -#ifdef CONFIG_HISAX_S0BOX -#define CARD_S0BOX 1 -#else -#define CARD_S0BOX 0 -#endif - -#ifdef CONFIG_HISAX_HSTSAPHIR -#define CARD_HSTSAPHIR 1 -#else -#define CARD_HSTSAPHIR 0 -#endif - #ifdef CONFIG_HISAX_TESTEMU -#define CARD_TESTEMU 1 #define ISDN_CTYPE_TESTEMU 99 #undef ISDN_CTYPE_COUNT #define ISDN_CTYPE_COUNT ISDN_CTYPE_TESTEMU -#else -#define CARD_TESTEMU 0 -#endif - -#ifdef CONFIG_HISAX_BKM_A4T -#define CARD_BKM_A4T 1 -#else -#define CARD_BKM_A4T 0 -#endif - -#ifdef CONFIG_HISAX_SCT_QUADRO -#define CARD_SCT_QUADRO 1 -#else -#define CARD_SCT_QUADRO 0 -#endif - -#ifdef CONFIG_HISAX_GAZEL -#define CARD_GAZEL 1 -#else -#define CARD_GAZEL 0 -#endif - -#ifdef CONFIG_HISAX_W6692 -#define CARD_W6692 1 -#else -#define CARD_W6692 0 #endif #ifdef CONFIG_HISAX_NETJET_U -#define CARD_NETJET_U 1 #ifndef HISAX_UINTERFACE #define HISAX_UINTERFACE 1 #endif #else -#define CARD_NETJET_U 0 -#endif - -#ifdef CONFIG_HISAX_ENTERNOW_PCI -#define CARD_FN_ENTERNOW_PCI 1 #endif #define TEI_PER_CARD 1 -- 2.53.0