Commit 0e30a0e2 authored by Valdis Kletnieks's avatar Valdis Kletnieks Committed by Linus Torvalds

[PATCH] #ifdef fixes for drivers/isdn/hifax/*

This patch changes a bunch of '#if CONFIG_PCI' to '#ifdef' instead,
to make the kernel source cleaner for compiling with 'gcc -Wundef'.
Signed-off-by: default avatarKarsten keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 915ae009
...@@ -265,7 +265,7 @@ setup_bkm_a4t(struct IsdnCard *card) ...@@ -265,7 +265,7 @@ setup_bkm_a4t(struct IsdnCard *card)
char tmp[64]; char tmp[64];
u_int pci_memaddr = 0, found = 0; u_int pci_memaddr = 0, found = 0;
I20_REGISTER_FILE *pI20_Regs; I20_REGISTER_FILE *pI20_Regs;
#if CONFIG_PCI #ifdef CONFIG_PCI
#endif #endif
strcpy(tmp, bkm_a4t_revision); strcpy(tmp, bkm_a4t_revision);
...@@ -275,7 +275,7 @@ setup_bkm_a4t(struct IsdnCard *card) ...@@ -275,7 +275,7 @@ setup_bkm_a4t(struct IsdnCard *card)
} else } else
return (0); return (0);
#if CONFIG_PCI #ifdef CONFIG_PCI
while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN,
PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) {
u16 sub_sys; u16 sub_sys;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include "bkm_ax.h" #include "bkm_ax.h"
#if CONFIG_PCI #ifdef CONFIG_PCI
#define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */ #define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */
...@@ -285,7 +285,7 @@ static u_char pci_irq __initdata = 0; ...@@ -285,7 +285,7 @@ static u_char pci_irq __initdata = 0;
int __init int __init
setup_sct_quadro(struct IsdnCard *card) setup_sct_quadro(struct IsdnCard *card)
{ {
#if CONFIG_PCI #ifdef CONFIG_PCI
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
u_char pci_rev_id; u_char pci_rev_id;
......
...@@ -1027,7 +1027,7 @@ setup_diva(struct IsdnCard *card) ...@@ -1027,7 +1027,7 @@ setup_diva(struct IsdnCard *card)
} }
} }
#endif #endif
#if CONFIG_PCI #ifdef CONFIG_PCI
cs->subtyp = 0; cs->subtyp = 0;
if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON,
PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) {
......
...@@ -1022,7 +1022,7 @@ setup_elsa(struct IsdnCard *card) ...@@ -1022,7 +1022,7 @@ setup_elsa(struct IsdnCard *card)
cs->hw.elsa.base, cs->hw.elsa.base,
cs->irq); cs->irq);
} else if (cs->typ == ISDN_CTYPE_ELSA_PCI) { } else if (cs->typ == ISDN_CTYPE_ELSA_PCI) {
#if CONFIG_PCI #ifdef CONFIG_PCI
cs->subtyp = 0; cs->subtyp = 0;
if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA, if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA,
PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) { PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) {
......
...@@ -299,7 +299,7 @@ setup_enternow_pci(struct IsdnCard *card) ...@@ -299,7 +299,7 @@ setup_enternow_pci(struct IsdnCard *card)
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
#if CONFIG_PCI #ifdef CONFIG_PCI
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
#error "not running on big endian machines now" #error "not running on big endian machines now"
#endif #endif
......
...@@ -634,7 +634,7 @@ setup_gazel(struct IsdnCard *card) ...@@ -634,7 +634,7 @@ setup_gazel(struct IsdnCard *card)
return (0); return (0);
} else { } else {
#if CONFIG_PCI #ifdef CONFIG_PCI
if (setup_gazelpci(cs)) if (setup_gazelpci(cs))
return (0); return (0);
#else #else
......
...@@ -65,7 +65,7 @@ static const PCI_ENTRY id_list[] = ...@@ -65,7 +65,7 @@ static const PCI_ENTRY id_list[] =
}; };
#if CONFIG_PCI #ifdef CONFIG_PCI
/******************************************/ /******************************************/
/* free hardware resources used by driver */ /* free hardware resources used by driver */
...@@ -1655,7 +1655,7 @@ setup_hfcpci(struct IsdnCard *card) ...@@ -1655,7 +1655,7 @@ setup_hfcpci(struct IsdnCard *card)
#endif #endif
strcpy(tmp, hfcpci_revision); strcpy(tmp, hfcpci_revision);
printk(KERN_INFO "HiSax: HFC-PCI driver Rev. %s\n", HiSax_getrev(tmp)); printk(KERN_INFO "HiSax: HFC-PCI driver Rev. %s\n", HiSax_getrev(tmp));
#if CONFIG_PCI #ifdef CONFIG_PCI
cs->hw.hfcpci.int_s1 = 0; cs->hw.hfcpci.int_s1 = 0;
cs->dc.hfcpci.ph_state = 0; cs->dc.hfcpci.ph_state = 0;
cs->hw.hfcpci.fifo = 255; cs->hw.hfcpci.fifo = 255;
......
...@@ -309,7 +309,7 @@ setup_niccy(struct IsdnCard *card) ...@@ -309,7 +309,7 @@ setup_niccy(struct IsdnCard *card)
return (0); return (0);
} }
} else { } else {
#if CONFIG_PCI #ifdef CONFIG_PCI
u_int pci_ioaddr; u_int pci_ioaddr;
cs->subtyp = 0; cs->subtyp = 0;
if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM, if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM,
......
...@@ -167,7 +167,7 @@ setup_netjet_s(struct IsdnCard *card) ...@@ -167,7 +167,7 @@ setup_netjet_s(struct IsdnCard *card)
return(0); return(0);
test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
#if CONFIG_PCI #ifdef CONFIG_PCI
for ( ;; ) for ( ;; )
{ {
......
...@@ -137,7 +137,7 @@ setup_netjet_u(struct IsdnCard *card) ...@@ -137,7 +137,7 @@ setup_netjet_u(struct IsdnCard *card)
int bytecnt; int bytecnt;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
#if CONFIG_PCI #ifdef CONFIG_PCI
#endif #endif
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
#error "not running on big endian machines now" #error "not running on big endian machines now"
...@@ -148,7 +148,7 @@ setup_netjet_u(struct IsdnCard *card) ...@@ -148,7 +148,7 @@ setup_netjet_u(struct IsdnCard *card)
return(0); return(0);
test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
#if CONFIG_PCI #ifdef CONFIG_PCI
for ( ;; ) for ( ;; )
{ {
......
...@@ -618,7 +618,7 @@ setup_sedlbauer(struct IsdnCard *card) ...@@ -618,7 +618,7 @@ setup_sedlbauer(struct IsdnCard *card)
} }
#endif #endif
/* Probe for Sedlbauer speed pci */ /* Probe for Sedlbauer speed pci */
#if CONFIG_PCI #ifdef CONFIG_PCI
if ((dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET, if ((dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET,
PCI_DEVICE_ID_TIGERJET_100, dev_sedl))) { PCI_DEVICE_ID_TIGERJET_100, dev_sedl))) {
if (pci_enable_device(dev_sedl)) if (pci_enable_device(dev_sedl))
......
...@@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card) ...@@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card)
printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp)); printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp));
if (cs->typ != ISDN_CTYPE_TELESPCI) if (cs->typ != ISDN_CTYPE_TELESPCI)
return (0); return (0);
#if CONFIG_PCI #ifdef CONFIG_PCI
if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) {
if (pci_enable_device(dev_tel)) if (pci_enable_device(dev_tel))
return(0); return(0);
......
...@@ -1012,7 +1012,7 @@ setup_w6692(struct IsdnCard *card) ...@@ -1012,7 +1012,7 @@ setup_w6692(struct IsdnCard *card)
printk(KERN_INFO "HiSax: W6692 driver Rev. %s\n", HiSax_getrev(tmp)); printk(KERN_INFO "HiSax: W6692 driver Rev. %s\n", HiSax_getrev(tmp));
if (cs->typ != ISDN_CTYPE_W6692) if (cs->typ != ISDN_CTYPE_W6692)
return (0); return (0);
#if CONFIG_PCI #ifdef CONFIG_PCI
while (id_list[id_idx].vendor_id) { while (id_list[id_idx].vendor_id) {
dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, dev_w6692 = pci_find_device(id_list[id_idx].vendor_id,
id_list[id_idx].device_id, id_list[id_idx].device_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment