aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorKarsten Keil <kkeil@suse.de>2006-07-10 07:44:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 16:24:15 -0400
commit67eb5db5874076db01febed5a1a9281628fa9fb4 (patch)
tree5116e91370d700c5eb497f13a24f10203baf5caa /drivers/isdn
parentacbf8bd738f1357e0e3b97b918bef5be272b176e (diff)
[PATCH] hisax: fix usage of __init*
Fix the warnings about the section mismatches for __init* in the HiSax driver. Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hisax/asuscom.c6
-rw-r--r--drivers/isdn/hisax/avm_a1.c2
-rw-r--r--drivers/isdn/hisax/avm_pci.c8
-rw-r--r--drivers/isdn/hisax/bkm_a4t.c4
-rw-r--r--drivers/isdn/hisax/bkm_a8.c16
-rw-r--r--drivers/isdn/hisax/config.c2
-rw-r--r--drivers/isdn/hisax/diva.c14
-rw-r--r--drivers/isdn/hisax/enternow_pci.c4
-rw-r--r--drivers/isdn/hisax/gazel.c8
-rw-r--r--drivers/isdn/hisax/hfc4s8s_l1.c2
-rw-r--r--drivers/isdn/hisax/hfc_2bds0.c4
-rw-r--r--drivers/isdn/hisax/hfc_2bs0.c4
-rw-r--r--drivers/isdn/hisax/hfc_pci.c6
-rw-r--r--drivers/isdn/hisax/hfcscard.c6
-rw-r--r--drivers/isdn/hisax/icc.c8
-rw-r--r--drivers/isdn/hisax/icc.h2
-rw-r--r--drivers/isdn/hisax/ipacx.c18
-rw-r--r--drivers/isdn/hisax/isurf.c4
-rw-r--r--drivers/isdn/hisax/ix1_micro.c6
-rw-r--r--drivers/isdn/hisax/jade.c6
-rw-r--r--drivers/isdn/hisax/mic.c2
-rw-r--r--drivers/isdn/hisax/netjet.c2
-rw-r--r--drivers/isdn/hisax/niccy.c4
-rw-r--r--drivers/isdn/hisax/nj_s.c4
-rw-r--r--drivers/isdn/hisax/nj_u.c4
-rw-r--r--drivers/isdn/hisax/s0box.c2
-rw-r--r--drivers/isdn/hisax/saphir.c2
-rw-r--r--drivers/isdn/hisax/sportster.c4
-rw-r--r--drivers/isdn/hisax/teleint.c2
-rw-r--r--drivers/isdn/hisax/teles0.c2
-rw-r--r--drivers/isdn/hisax/telespci.c4
-rw-r--r--drivers/isdn/hisax/w6692.c10
32 files changed, 86 insertions, 86 deletions
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index a98c5e38bbbc..93ff941c48f1 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -297,7 +297,7 @@ Asus_card_msg(struct IsdnCardState *cs, int mt, void *arg)
297} 297}
298 298
299#ifdef __ISAPNP__ 299#ifdef __ISAPNP__
300static struct isapnp_device_id asus_ids[] __initdata = { 300static struct isapnp_device_id asus_ids[] __devinitdata = {
301 { ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), 301 { ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688),
302 ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), 302 ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688),
303 (unsigned long) "Asus1688 PnP" }, 303 (unsigned long) "Asus1688 PnP" },
@@ -313,11 +313,11 @@ static struct isapnp_device_id asus_ids[] __initdata = {
313 { 0, } 313 { 0, }
314}; 314};
315 315
316static struct isapnp_device_id *ipid __initdata = &asus_ids[0]; 316static struct isapnp_device_id *ipid __devinitdata = &asus_ids[0];
317static struct pnp_card *pnp_c __devinitdata = NULL; 317static struct pnp_card *pnp_c __devinitdata = NULL;
318#endif 318#endif
319 319
320int __init 320int __devinit
321setup_asuscom(struct IsdnCard *card) 321setup_asuscom(struct IsdnCard *card)
322{ 322{
323 int bytecnt; 323 int bytecnt;
diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c
index 9a8b02557ff9..729e906bdc61 100644
--- a/drivers/isdn/hisax/avm_a1.c
+++ b/drivers/isdn/hisax/avm_a1.c
@@ -178,7 +178,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
178 return(0); 178 return(0);
179} 179}
180 180
181int __init 181int __devinit
182setup_avm_a1(struct IsdnCard *card) 182setup_avm_a1(struct IsdnCard *card)
183{ 183{
184 u_char val; 184 u_char val;
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 04f5917bf5a1..369afd3a3a4b 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -639,7 +639,7 @@ clear_pending_hdlc_ints(struct IsdnCardState *cs)
639} 639}
640#endif /* 0 */ 640#endif /* 0 */
641 641
642static void __init 642static void
643inithdlc(struct IsdnCardState *cs) 643inithdlc(struct IsdnCardState *cs)
644{ 644{
645 cs->bcs[0].BC_SetStack = setstack_hdlc; 645 cs->bcs[0].BC_SetStack = setstack_hdlc;
@@ -727,13 +727,13 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
727} 727}
728 728
729#ifdef CONFIG_PCI 729#ifdef CONFIG_PCI
730static struct pci_dev *dev_avm __initdata = NULL; 730static struct pci_dev *dev_avm __devinitdata = NULL;
731#endif 731#endif
732#ifdef __ISAPNP__ 732#ifdef __ISAPNP__
733static struct pnp_card *pnp_avm_c __initdata = NULL; 733static struct pnp_card *pnp_avm_c __devinitdata = NULL;
734#endif 734#endif
735 735
736int __init 736int __devinit
737setup_avm_pcipnp(struct IsdnCard *card) 737setup_avm_pcipnp(struct IsdnCard *card)
738{ 738{
739 u_int val, ver; 739 u_int val, ver;
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
index 3cf1f2421789..87a630128a6c 100644
--- a/drivers/isdn/hisax/bkm_a4t.c
+++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -255,9 +255,9 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
255 return (0); 255 return (0);
256} 256}
257 257
258static struct pci_dev *dev_a4t __initdata = NULL; 258static struct pci_dev *dev_a4t __devinitdata = NULL;
259 259
260int __init 260int __devinit
261setup_bkm_a4t(struct IsdnCard *card) 261setup_bkm_a4t(struct IsdnCard *card)
262{ 262{
263 struct IsdnCardState *cs = card->cs; 263 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
index 15681f3e73b8..dae090a9a489 100644
--- a/drivers/isdn/hisax/bkm_a8.c
+++ b/drivers/isdn/hisax/bkm_a8.c
@@ -260,7 +260,7 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
260 return (0); 260 return (0);
261} 261}
262 262
263static int __init 263static int __devinit
264sct_alloc_io(u_int adr, u_int len) 264sct_alloc_io(u_int adr, u_int len)
265{ 265{
266 if (!request_region(adr, len, "scitel")) { 266 if (!request_region(adr, len, "scitel")) {
@@ -272,16 +272,16 @@ sct_alloc_io(u_int adr, u_int len)
272 return(0); 272 return(0);
273} 273}
274 274
275static struct pci_dev *dev_a8 __initdata = NULL; 275static struct pci_dev *dev_a8 __devinitdata = NULL;
276static u16 sub_vendor_id __initdata = 0; 276static u16 sub_vendor_id __devinitdata = 0;
277static u16 sub_sys_id __initdata = 0; 277static u16 sub_sys_id __devinitdata = 0;
278static u_char pci_bus __initdata = 0; 278static u_char pci_bus __devinitdata = 0;
279static u_char pci_device_fn __initdata = 0; 279static u_char pci_device_fn __devinitdata = 0;
280static u_char pci_irq __initdata = 0; 280static u_char pci_irq __devinitdata = 0;
281 281
282#endif /* CONFIG_PCI */ 282#endif /* CONFIG_PCI */
283 283
284int __init 284int __devinit
285setup_sct_quadro(struct IsdnCard *card) 285setup_sct_quadro(struct IsdnCard *card)
286{ 286{
287#ifdef CONFIG_PCI 287#ifdef CONFIG_PCI
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 5333be5d2c47..e10350360f2f 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1875,7 +1875,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
1875#ifdef CONFIG_PCI 1875#ifdef CONFIG_PCI
1876#include <linux/pci.h> 1876#include <linux/pci.h>
1877 1877
1878static struct pci_device_id hisax_pci_tbl[] __initdata = { 1878static struct pci_device_id hisax_pci_tbl[] __devinitdata = {
1879#ifdef CONFIG_HISAX_FRITZPCI 1879#ifdef CONFIG_HISAX_FRITZPCI
1880 {PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID}, 1880 {PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID},
1881#endif 1881#endif
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 323a02ef3844..e294fa3918f3 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -887,13 +887,13 @@ Diva_card_msg(struct IsdnCardState *cs, int mt, void *arg)
887 return(0); 887 return(0);
888} 888}
889 889
890static struct pci_dev *dev_diva __initdata = NULL; 890static struct pci_dev *dev_diva __devinitdata = NULL;
891static struct pci_dev *dev_diva_u __initdata = NULL; 891static struct pci_dev *dev_diva_u __devinitdata = NULL;
892static struct pci_dev *dev_diva201 __initdata = NULL; 892static struct pci_dev *dev_diva201 __devinitdata = NULL;
893static struct pci_dev *dev_diva202 __initdata = NULL; 893static struct pci_dev *dev_diva202 __devinitdata = NULL;
894 894
895#ifdef __ISAPNP__ 895#ifdef __ISAPNP__
896static struct isapnp_device_id diva_ids[] __initdata = { 896static struct isapnp_device_id diva_ids[] __devinitdata = {
897 { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), 897 { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),
898 ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), 898 ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),
899 (unsigned long) "Diva picola" }, 899 (unsigned long) "Diva picola" },
@@ -915,12 +915,12 @@ static struct isapnp_device_id diva_ids[] __initdata = {
915 { 0, } 915 { 0, }
916}; 916};
917 917
918static struct isapnp_device_id *ipid __initdata = &diva_ids[0]; 918static struct isapnp_device_id *ipid __devinitdata = &diva_ids[0];
919static struct pnp_card *pnp_c __devinitdata = NULL; 919static struct pnp_card *pnp_c __devinitdata = NULL;
920#endif 920#endif
921 921
922 922
923int __init 923int __devinit
924setup_diva(struct IsdnCard *card) 924setup_diva(struct IsdnCard *card)
925{ 925{
926 int bytecnt = 8; 926 int bytecnt = 8;
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index 8fcbe2e7d765..76c7d29d1b2f 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -301,10 +301,10 @@ enpci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
301} 301}
302 302
303 303
304static struct pci_dev *dev_netjet __initdata = NULL; 304static struct pci_dev *dev_netjet __devinitdata = NULL;
305 305
306/* called by config.c */ 306/* called by config.c */
307int __init 307int __devinit
308setup_enternow_pci(struct IsdnCard *card) 308setup_enternow_pci(struct IsdnCard *card)
309{ 309{
310 int bytecnt; 310 int bytecnt;
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index 3e7d92303582..fe2937267777 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -484,7 +484,7 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs)
484 return 1; 484 return 1;
485} 485}
486 486
487static int __init 487static int __devinit
488setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) 488setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
489{ 489{
490 printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n"); 490 printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n");
@@ -532,9 +532,9 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
532 return (0); 532 return (0);
533} 533}
534 534
535static struct pci_dev *dev_tel __initdata = NULL; 535static struct pci_dev *dev_tel __devinitdata = NULL;
536 536
537static int __init 537static int __devinit
538setup_gazelpci(struct IsdnCardState *cs) 538setup_gazelpci(struct IsdnCardState *cs)
539{ 539{
540 u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0; 540 u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0;
@@ -621,7 +621,7 @@ setup_gazelpci(struct IsdnCardState *cs)
621 return (0); 621 return (0);
622} 622}
623 623
624int __init 624int __devinit
625setup_gazel(struct IsdnCard *card) 625setup_gazel(struct IsdnCard *card)
626{ 626{
627 struct IsdnCardState *cs = card->cs; 627 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 0f967b3df79d..3a5ca8a68fc4 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1703,7 +1703,7 @@ hfc4s8s_module_init(void)
1703/* driver module exit : */ 1703/* driver module exit : */
1704/* release the HFC-4s/8s hardware */ 1704/* release the HFC-4s/8s hardware */
1705/*************************************/ 1705/*************************************/
1706static void 1706static void __exit
1707hfc4s8s_module_exit(void) 1707hfc4s8s_module_exit(void)
1708{ 1708{
1709 pci_unregister_driver(&hfc4s8s_driver); 1709 pci_unregister_driver(&hfc4s8s_driver);
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 637a261c9312..6360e8214720 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1015,7 +1015,7 @@ hfc_dbusy_timer(struct IsdnCardState *cs)
1015{ 1015{
1016} 1016}
1017 1017
1018static unsigned int __init 1018static unsigned int
1019*init_send_hfcd(int cnt) 1019*init_send_hfcd(int cnt)
1020{ 1020{
1021 int i, *send; 1021 int i, *send;
@@ -1030,7 +1030,7 @@ static unsigned int __init
1030 return(send); 1030 return(send);
1031} 1031}
1032 1032
1033void __init 1033void
1034init2bds0(struct IsdnCardState *cs) 1034init2bds0(struct IsdnCardState *cs)
1035{ 1035{
1036 cs->setstack_d = setstack_hfcd; 1036 cs->setstack_d = setstack_hfcd;
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
index c964539cc43e..d0520ad30677 100644
--- a/drivers/isdn/hisax/hfc_2bs0.c
+++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -551,7 +551,7 @@ setstack_hfc(struct PStack *st, struct BCState *bcs)
551 return (0); 551 return (0);
552} 552}
553 553
554static void __init 554static void
555init_send(struct BCState *bcs) 555init_send(struct BCState *bcs)
556{ 556{
557 int i; 557 int i;
@@ -565,7 +565,7 @@ init_send(struct BCState *bcs)
565 bcs->hw.hfc.send[i] = 0x1fff; 565 bcs->hw.hfc.send[i] = 0x1fff;
566} 566}
567 567
568void __init 568void
569inithfc(struct IsdnCardState *cs) 569inithfc(struct IsdnCardState *cs)
570{ 570{
571 init_send(&cs->bcs[0]); 571 init_send(&cs->bcs[0]);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 7241e73879ba..1df60ca9481f 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1581,7 +1581,7 @@ hfcpci_bh(struct IsdnCardState *cs)
1581/********************************/ 1581/********************************/
1582/* called for card init message */ 1582/* called for card init message */
1583/********************************/ 1583/********************************/
1584static void __init 1584static void
1585inithfcpci(struct IsdnCardState *cs) 1585inithfcpci(struct IsdnCardState *cs)
1586{ 1586{
1587 cs->bcs[0].BC_SetStack = setstack_2b; 1587 cs->bcs[0].BC_SetStack = setstack_2b;
@@ -1638,11 +1638,11 @@ hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
1638 1638
1639 1639
1640/* this variable is used as card index when more than one cards are present */ 1640/* this variable is used as card index when more than one cards are present */
1641static struct pci_dev *dev_hfcpci __initdata = NULL; 1641static struct pci_dev *dev_hfcpci __devinitdata = NULL;
1642 1642
1643#endif /* CONFIG_PCI */ 1643#endif /* CONFIG_PCI */
1644 1644
1645int __init 1645int __devinit
1646setup_hfcpci(struct IsdnCard *card) 1646setup_hfcpci(struct IsdnCard *card)
1647{ 1647{
1648 u_long flags; 1648 u_long flags;
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 86ab1c13f6b1..4e7f472877e9 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -139,7 +139,7 @@ hfcs_card_msg(struct IsdnCardState *cs, int mt, void *arg)
139} 139}
140 140
141#ifdef __ISAPNP__ 141#ifdef __ISAPNP__
142static struct isapnp_device_id hfc_ids[] __initdata = { 142static struct isapnp_device_id hfc_ids[] __devinitdata = {
143 { ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), 143 { ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),
144 ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), 144 ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),
145 (unsigned long) "Acer P10" }, 145 (unsigned long) "Acer P10" },
@@ -164,11 +164,11 @@ static struct isapnp_device_id hfc_ids[] __initdata = {
164 { 0, } 164 { 0, }
165}; 165};
166 166
167static struct isapnp_device_id *ipid __initdata = &hfc_ids[0]; 167static struct isapnp_device_id *ipid __devinitdata = &hfc_ids[0];
168static struct pnp_card *pnp_c __devinitdata = NULL; 168static struct pnp_card *pnp_c __devinitdata = NULL;
169#endif 169#endif
170 170
171int __init 171int __devinit
172setup_hfcs(struct IsdnCard *card) 172setup_hfcs(struct IsdnCard *card)
173{ 173{
174 struct IsdnCardState *cs = card->cs; 174 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c
index c615752b96aa..2cf7b665609e 100644
--- a/drivers/isdn/hisax/icc.c
+++ b/drivers/isdn/hisax/icc.c
@@ -24,10 +24,10 @@
24#define DBUSY_TIMER_VALUE 80 24#define DBUSY_TIMER_VALUE 80
25#define ARCOFI_USE 0 25#define ARCOFI_USE 0
26 26
27static char *ICCVer[] __initdata = 27static char *ICCVer[] =
28{"2070 A1/A3", "2070 B1", "2070 B2/B3", "2070 V2.4"}; 28{"2070 A1/A3", "2070 B1", "2070 B2/B3", "2070 V2.4"};
29 29
30void __init 30void
31ICCVersion(struct IsdnCardState *cs, char *s) 31ICCVersion(struct IsdnCardState *cs, char *s)
32{ 32{
33 int val; 33 int val;
@@ -613,7 +613,7 @@ dbusy_timer_handler(struct IsdnCardState *cs)
613 } 613 }
614} 614}
615 615
616void __init 616void
617initicc(struct IsdnCardState *cs) 617initicc(struct IsdnCardState *cs)
618{ 618{
619 cs->setstack_d = setstack_icc; 619 cs->setstack_d = setstack_icc;
@@ -646,7 +646,7 @@ initicc(struct IsdnCardState *cs)
646 ph_command(cs, ICC_CMD_DI); 646 ph_command(cs, ICC_CMD_DI);
647} 647}
648 648
649void __init 649void
650clear_pending_icc_ints(struct IsdnCardState *cs) 650clear_pending_icc_ints(struct IsdnCardState *cs)
651{ 651{
652 int val, eval; 652 int val, eval;
diff --git a/drivers/isdn/hisax/icc.h b/drivers/isdn/hisax/icc.h
index b3bb3d5de532..e7f593967e43 100644
--- a/drivers/isdn/hisax/icc.h
+++ b/drivers/isdn/hisax/icc.h
@@ -65,7 +65,7 @@
65#define ICC_IND_AIL 0xE 65#define ICC_IND_AIL 0xE
66#define ICC_IND_DC 0xF 66#define ICC_IND_DC 0xF
67 67
68extern void __init ICCVersion(struct IsdnCardState *cs, char *s); 68extern void ICCVersion(struct IsdnCardState *cs, char *s);
69extern void initicc(struct IsdnCardState *cs); 69extern void initicc(struct IsdnCardState *cs);
70extern void icc_interrupt(struct IsdnCardState *cs, u_char val); 70extern void icc_interrupt(struct IsdnCardState *cs, u_char val);
71extern void clear_pending_icc_ints(struct IsdnCardState *cs); 71extern void clear_pending_icc_ints(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
index df5fc92a89b2..00afd5538909 100644
--- a/drivers/isdn/hisax/ipacx.c
+++ b/drivers/isdn/hisax/ipacx.c
@@ -38,8 +38,8 @@ static void dbusy_timer_handler(struct IsdnCardState *cs);
38static void dch_empty_fifo(struct IsdnCardState *cs, int count); 38static void dch_empty_fifo(struct IsdnCardState *cs, int count);
39static void dch_fill_fifo(struct IsdnCardState *cs); 39static void dch_fill_fifo(struct IsdnCardState *cs);
40static inline void dch_int(struct IsdnCardState *cs); 40static inline void dch_int(struct IsdnCardState *cs);
41static void __devinit dch_setstack(struct PStack *st, struct IsdnCardState *cs); 41static void dch_setstack(struct PStack *st, struct IsdnCardState *cs);
42static void __devinit dch_init(struct IsdnCardState *cs); 42static void dch_init(struct IsdnCardState *cs);
43static void bch_l2l1(struct PStack *st, int pr, void *arg); 43static void bch_l2l1(struct PStack *st, int pr, void *arg);
44static void bch_empty_fifo(struct BCState *bcs, int count); 44static void bch_empty_fifo(struct BCState *bcs, int count);
45static void bch_fill_fifo(struct BCState *bcs); 45static void bch_fill_fifo(struct BCState *bcs);
@@ -48,8 +48,8 @@ static void bch_mode(struct BCState *bcs, int mode, int bc);
48static void bch_close_state(struct BCState *bcs); 48static void bch_close_state(struct BCState *bcs);
49static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs); 49static int bch_open_state(struct IsdnCardState *cs, struct BCState *bcs);
50static int bch_setstack(struct PStack *st, struct BCState *bcs); 50static int bch_setstack(struct PStack *st, struct BCState *bcs);
51static void __devinit bch_init(struct IsdnCardState *cs, int hscx); 51static void bch_init(struct IsdnCardState *cs, int hscx);
52static void __init clear_pending_ints(struct IsdnCardState *cs); 52static void clear_pending_ints(struct IsdnCardState *cs);
53 53
54//---------------------------------------------------------- 54//----------------------------------------------------------
55// Issue Layer 1 command to chip 55// Issue Layer 1 command to chip
@@ -408,7 +408,7 @@ dch_int(struct IsdnCardState *cs)
408 408
409//---------------------------------------------------------- 409//----------------------------------------------------------
410//---------------------------------------------------------- 410//----------------------------------------------------------
411static void __devinit 411static void
412dch_setstack(struct PStack *st, struct IsdnCardState *cs) 412dch_setstack(struct PStack *st, struct IsdnCardState *cs)
413{ 413{
414 st->l1.l1hw = dch_l2l1; 414 st->l1.l1hw = dch_l2l1;
@@ -416,7 +416,7 @@ dch_setstack(struct PStack *st, struct IsdnCardState *cs)
416 416
417//---------------------------------------------------------- 417//----------------------------------------------------------
418//---------------------------------------------------------- 418//----------------------------------------------------------
419static void __devinit 419static void
420dch_init(struct IsdnCardState *cs) 420dch_init(struct IsdnCardState *cs)
421{ 421{
422 printk(KERN_INFO "HiSax: IPACX ISDN driver v0.1.0\n"); 422 printk(KERN_INFO "HiSax: IPACX ISDN driver v0.1.0\n");
@@ -823,7 +823,7 @@ bch_setstack(struct PStack *st, struct BCState *bcs)
823 823
824//---------------------------------------------------------- 824//----------------------------------------------------------
825//---------------------------------------------------------- 825//----------------------------------------------------------
826static void __devinit 826static void
827bch_init(struct IsdnCardState *cs, int hscx) 827bch_init(struct IsdnCardState *cs, int hscx)
828{ 828{
829 cs->bcs[hscx].BC_SetStack = bch_setstack; 829 cs->bcs[hscx].BC_SetStack = bch_setstack;
@@ -861,7 +861,7 @@ interrupt_ipacx(struct IsdnCardState *cs)
861//---------------------------------------------------------- 861//----------------------------------------------------------
862// Clears chip interrupt status 862// Clears chip interrupt status
863//---------------------------------------------------------- 863//----------------------------------------------------------
864static void __init 864static void
865clear_pending_ints(struct IsdnCardState *cs) 865clear_pending_ints(struct IsdnCardState *cs)
866{ 866{
867 int ista; 867 int ista;
@@ -883,7 +883,7 @@ clear_pending_ints(struct IsdnCardState *cs)
883// Does chip configuration work 883// Does chip configuration work
884// Work to do depends on bit mask in part 884// Work to do depends on bit mask in part
885//---------------------------------------------------------- 885//----------------------------------------------------------
886void __init 886void
887init_ipacx(struct IsdnCardState *cs, int part) 887init_ipacx(struct IsdnCardState *cs, int part)
888{ 888{
889 if (part &1) { // initialise chip 889 if (part &1) { // initialise chip
diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index 33747afc984d..715a1a8cd694 100644
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -196,10 +196,10 @@ isurf_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
196} 196}
197 197
198#ifdef __ISAPNP__ 198#ifdef __ISAPNP__
199static struct pnp_card *pnp_c __initdata = NULL; 199static struct pnp_card *pnp_c __devinitdata = NULL;
200#endif 200#endif
201 201
202int __init 202int __devinit
203setup_isurf(struct IsdnCard *card) 203setup_isurf(struct IsdnCard *card)
204{ 204{
205 int ver; 205 int ver;
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 908a7e144421..39717506c678 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -210,7 +210,7 @@ ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg)
210} 210}
211 211
212#ifdef __ISAPNP__ 212#ifdef __ISAPNP__
213static struct isapnp_device_id itk_ids[] __initdata = { 213static struct isapnp_device_id itk_ids[] __devinitdata = {
214 { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), 214 { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
215 ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), 215 ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
216 (unsigned long) "ITK micro 2" }, 216 (unsigned long) "ITK micro 2" },
@@ -220,12 +220,12 @@ static struct isapnp_device_id itk_ids[] __initdata = {
220 { 0, } 220 { 0, }
221}; 221};
222 222
223static struct isapnp_device_id *ipid __initdata = &itk_ids[0]; 223static struct isapnp_device_id *ipid __devinitdata = &itk_ids[0];
224static struct pnp_card *pnp_c __devinitdata = NULL; 224static struct pnp_card *pnp_c __devinitdata = NULL;
225#endif 225#endif
226 226
227 227
228int __init 228int __devinit
229setup_ix1micro(struct IsdnCard *card) 229setup_ix1micro(struct IsdnCard *card)
230{ 230{
231 struct IsdnCardState *cs = card->cs; 231 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index 2659fecc2674..43d61d1bc5b6 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -19,7 +19,7 @@
19#include <linux/interrupt.h> 19#include <linux/interrupt.h>
20 20
21 21
22int __init 22int
23JadeVersion(struct IsdnCardState *cs, char *s) 23JadeVersion(struct IsdnCardState *cs, char *s)
24{ 24{
25 int ver,i; 25 int ver,i;
@@ -253,7 +253,7 @@ setstack_jade(struct PStack *st, struct BCState *bcs)
253 return (0); 253 return (0);
254} 254}
255 255
256void __init 256void
257clear_pending_jade_ints(struct IsdnCardState *cs) 257clear_pending_jade_ints(struct IsdnCardState *cs)
258{ 258{
259 int val; 259 int val;
@@ -279,7 +279,7 @@ clear_pending_jade_ints(struct IsdnCardState *cs)
279 cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0xF8); 279 cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0xF8);
280} 280}
281 281
282void __init 282void
283initjade(struct IsdnCardState *cs) 283initjade(struct IsdnCardState *cs)
284{ 284{
285 cs->bcs[0].BC_SetStack = setstack_jade; 285 cs->bcs[0].BC_SetStack = setstack_jade;
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index fe11f226b285..8c82519593a8 100644
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -189,7 +189,7 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg)
189 return(0); 189 return(0);
190} 190}
191 191
192int __init 192int __devinit
193setup_mic(struct IsdnCard *card) 193setup_mic(struct IsdnCard *card)
194{ 194{
195 int bytecnt; 195 int bytecnt;
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c
index 47a47ef0968b..38f648f9b0ed 100644
--- a/drivers/isdn/hisax/netjet.c
+++ b/drivers/isdn/hisax/netjet.c
@@ -909,7 +909,7 @@ setstack_tiger(struct PStack *st, struct BCState *bcs)
909} 909}
910 910
911 911
912void __init 912void
913inittiger(struct IsdnCardState *cs) 913inittiger(struct IsdnCardState *cs)
914{ 914{
915 if (!(cs->bcs[0].hw.tiger.send = kmalloc(NETJET_DMA_TXSIZE * sizeof(unsigned int), 915 if (!(cs->bcs[0].hw.tiger.send = kmalloc(NETJET_DMA_TXSIZE * sizeof(unsigned int),
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 79a97b1c3812..489022bdef7b 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -232,12 +232,12 @@ niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg)
232 return(0); 232 return(0);
233} 233}
234 234
235static struct pci_dev *niccy_dev __initdata = NULL; 235static struct pci_dev *niccy_dev __devinitdata = NULL;
236#ifdef __ISAPNP__ 236#ifdef __ISAPNP__
237static struct pnp_card *pnp_c __devinitdata = NULL; 237static struct pnp_card *pnp_c __devinitdata = NULL;
238#endif 238#endif
239 239
240int __init 240int __devinit
241setup_niccy(struct IsdnCard *card) 241setup_niccy(struct IsdnCard *card)
242{ 242{
243 struct IsdnCardState *cs = card->cs; 243 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index e5b900a6fa0b..80025fd890f4 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -148,9 +148,9 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
148 return(0); 148 return(0);
149} 149}
150 150
151static struct pci_dev *dev_netjet __initdata = NULL; 151static struct pci_dev *dev_netjet __devinitdata = NULL;
152 152
153int __init 153int __devinit
154setup_netjet_s(struct IsdnCard *card) 154setup_netjet_s(struct IsdnCard *card)
155{ 155{
156 int bytecnt,cfg; 156 int bytecnt,cfg;
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c
index 7002b09936d4..37497162d539 100644
--- a/drivers/isdn/hisax/nj_u.c
+++ b/drivers/isdn/hisax/nj_u.c
@@ -128,9 +128,9 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg)
128 return(0); 128 return(0);
129} 129}
130 130
131static struct pci_dev *dev_netjet __initdata = NULL; 131static struct pci_dev *dev_netjet __devinitdata = NULL;
132 132
133int __init 133int __devinit
134setup_netjet_u(struct IsdnCard *card) 134setup_netjet_u(struct IsdnCard *card)
135{ 135{
136 int bytecnt; 136 int bytecnt;
diff --git a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c
index 7b63085ea6e5..e76042d323ea 100644
--- a/drivers/isdn/hisax/s0box.c
+++ b/drivers/isdn/hisax/s0box.c
@@ -211,7 +211,7 @@ S0Box_card_msg(struct IsdnCardState *cs, int mt, void *arg)
211 return(0); 211 return(0);
212} 212}
213 213
214int __init 214int __devinit
215setup_s0box(struct IsdnCard *card) 215setup_s0box(struct IsdnCard *card)
216{ 216{
217 struct IsdnCardState *cs = card->cs; 217 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index 821776e1561a..d943d365890b 100644
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -241,7 +241,7 @@ saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg)
241} 241}
242 242
243 243
244int __init 244int __devinit
245setup_saphir(struct IsdnCard *card) 245setup_saphir(struct IsdnCard *card)
246{ 246{
247 struct IsdnCardState *cs = card->cs; 247 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c
index cdf35dc564c4..a49b694eb730 100644
--- a/drivers/isdn/hisax/sportster.c
+++ b/drivers/isdn/hisax/sportster.c
@@ -184,7 +184,7 @@ Sportster_card_msg(struct IsdnCardState *cs, int mt, void *arg)
184 return(0); 184 return(0);
185} 185}
186 186
187static int __init 187static int __devinit
188get_io_range(struct IsdnCardState *cs) 188get_io_range(struct IsdnCardState *cs)
189{ 189{
190 int i, j, adr; 190 int i, j, adr;
@@ -209,7 +209,7 @@ get_io_range(struct IsdnCardState *cs)
209 } 209 }
210} 210}
211 211
212int __init 212int __devinit
213setup_sportster(struct IsdnCard *card) 213setup_sportster(struct IsdnCard *card)
214{ 214{
215 struct IsdnCardState *cs = card->cs; 215 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/teleint.c b/drivers/isdn/hisax/teleint.c
index a2b1816af37a..e94dc6f5bd62 100644
--- a/drivers/isdn/hisax/teleint.c
+++ b/drivers/isdn/hisax/teleint.c
@@ -261,7 +261,7 @@ TeleInt_card_msg(struct IsdnCardState *cs, int mt, void *arg)
261 return(0); 261 return(0);
262} 262}
263 263
264int __init 264int __devinit
265setup_TeleInt(struct IsdnCard *card) 265setup_TeleInt(struct IsdnCard *card)
266{ 266{
267 struct IsdnCardState *cs = card->cs; 267 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c
index 2b7df8f98233..f94af0930a17 100644
--- a/drivers/isdn/hisax/teles0.c
+++ b/drivers/isdn/hisax/teles0.c
@@ -265,7 +265,7 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)
265 return(0); 265 return(0);
266} 266}
267 267
268int __init 268int __devinit
269setup_teles0(struct IsdnCard *card) 269setup_teles0(struct IsdnCard *card)
270{ 270{
271 u_char val; 271 u_char val;
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index 9382cdf04d8d..dca446865f24 100644
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -284,9 +284,9 @@ TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg)
284 return(0); 284 return(0);
285} 285}
286 286
287static struct pci_dev *dev_tel __initdata = NULL; 287static struct pci_dev *dev_tel __devinitdata = NULL;
288 288
289int __init 289int __devinit
290setup_telespci(struct IsdnCard *card) 290setup_telespci(struct IsdnCard *card)
291{ 291{
292 struct IsdnCardState *cs = card->cs; 292 struct IsdnCardState *cs = card->cs;
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c
index 6c68419c05ff..0595293b8659 100644
--- a/drivers/isdn/hisax/w6692.c
+++ b/drivers/isdn/hisax/w6692.c
@@ -44,11 +44,11 @@ static const char *w6692_revision = "$Revision: 1.18.2.4 $";
44 44
45#define DBUSY_TIMER_VALUE 80 45#define DBUSY_TIMER_VALUE 80
46 46
47static char *W6692Ver[] __initdata = 47static char *W6692Ver[] =
48{"W6692 V00", "W6692 V01", "W6692 V10", 48{"W6692 V00", "W6692 V01", "W6692 V10",
49 "W6692 V11"}; 49 "W6692 V11"};
50 50
51static void __init 51static void
52W6692Version(struct IsdnCardState *cs, char *s) 52W6692Version(struct IsdnCardState *cs, char *s)
53{ 53{
54 int val; 54 int val;
@@ -897,7 +897,7 @@ static void resetW6692(struct IsdnCardState *cs)
897 } 897 }
898} 898}
899 899
900static void __init initW6692(struct IsdnCardState *cs, int part) 900static void initW6692(struct IsdnCardState *cs, int part)
901{ 901{
902 if (part & 1) { 902 if (part & 1) {
903 cs->setstack_d = setstack_W6692; 903 cs->setstack_d = setstack_W6692;
@@ -992,9 +992,9 @@ w6692_card_msg(struct IsdnCardState *cs, int mt, void *arg)
992 992
993static int id_idx ; 993static int id_idx ;
994 994
995static struct pci_dev *dev_w6692 __initdata = NULL; 995static struct pci_dev *dev_w6692 __devinitdata = NULL;
996 996
997int __init 997int __devinit
998setup_w6692(struct IsdnCard *card) 998setup_w6692(struct IsdnCard *card)
999{ 999{
1000 struct IsdnCardState *cs = card->cs; 1000 struct IsdnCardState *cs = card->cs;