dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Drivers: isdn: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:13:05 -08:00
parent 150632b09a
commit ed5a84cdf5
51 changed files with 217 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/isdn/hardware/avm/b1pci.c
View File

@ -299,8 +299,8 @@ static void b1pciv4_remove(struct pci_dev *pdev)
#endif /* CONFIG_ISDN_DRV_AVMB1_B1PCIV4 */ #endif /* CONFIG_ISDN_DRV_AVMB1_B1PCIV4 */
static int __devinit b1pci_pci_probe(struct pci_dev *pdev, static int b1pci_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct capicardparams param; struct capicardparams param;
int retval; int retval;
@ -344,7 +344,7 @@ static int __devinit b1pci_pci_probe(struct pci_dev *pdev,
return retval; return retval;
} }
static void __devexit b1pci_pci_remove(struct pci_dev *pdev) static void b1pci_pci_remove(struct pci_dev *pdev)
{ {
#ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4 #ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4
avmcard *card = pci_get_drvdata(pdev); avmcard *card = pci_get_drvdata(pdev);
@ -362,7 +362,7 @@ static struct pci_driver b1pci_pci_driver = {
.name = "b1pci", .name = "b1pci",
.id_table = b1pci_pci_tbl, .id_table = b1pci_pci_tbl,
.probe = b1pci_pci_probe, .probe = b1pci_pci_probe,
.remove = __devexit_p(b1pci_pci_remove), .remove = b1pci_pci_remove,
}; };
static struct capi_driver capi_driver_b1pci = { static struct capi_driver capi_driver_b1pci = {

3
drivers/isdn/hardware/avm/c4.c
View File

@ -1249,8 +1249,7 @@ err:
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
static int __devinit c4_probe(struct pci_dev *dev, static int c4_probe(struct pci_dev *dev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
int nr = ent->driver_data; int nr = ent->driver_data;
int retval = 0; int retval = 0;

3
drivers/isdn/hardware/avm/t1pci.c
View File

@ -187,8 +187,7 @@ static char *t1pci_procinfo(struct capi_ctr *ctrl)
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
static int __devinit t1pci_probe(struct pci_dev *dev, static int t1pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct capicardparams param; struct capicardparams param;
int retval; int retval;

9
drivers/isdn/hardware/eicon/divasmain.c
View File

@ -150,12 +150,12 @@ MODULE_DEVICE_TABLE(pci, divas_pci_tbl);
static int divas_init_one(struct pci_dev *pdev, static int divas_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent); const struct pci_device_id *ent);
static void __devexit divas_remove_one(struct pci_dev *pdev); static void divas_remove_one(struct pci_dev *pdev);
static struct pci_driver diva_pci_driver = { static struct pci_driver diva_pci_driver = {
.name = "divas", .name = "divas",
.probe = divas_init_one, .probe = divas_init_one,
.remove = __devexit_p(divas_remove_one), .remove = divas_remove_one,
.id_table = divas_pci_tbl, .id_table = divas_pci_tbl,
}; };
@ -688,8 +688,7 @@ static int __init divas_register_chrdev(void)
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
PCI driver section PCI driver section
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static int __devinit divas_init_one(struct pci_dev *pdev, static int divas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
void *pdiva = NULL; void *pdiva = NULL;
u8 pci_latency; u8 pci_latency;
@ -749,7 +748,7 @@ static int __devinit divas_init_one(struct pci_dev *pdev,
return (0); return (0);
} }
static void __devexit divas_remove_one(struct pci_dev *pdev) static void divas_remove_one(struct pci_dev *pdev)
{ {
void *pdiva = pci_get_drvdata(pdev); void *pdiva = pci_get_drvdata(pdev);

10
drivers/isdn/hardware/mISDN/avmfritz.c
View File

@ -1034,7 +1034,7 @@ release_card(struct fritzcard *card)
AVM_cnt--; AVM_cnt--;
} }
static int __devinit static int
setup_instance(struct fritzcard *card) setup_instance(struct fritzcard *card)
{ {
int i, err; int i, err;
@ -1096,7 +1096,7 @@ error:
return err; return err;
} }
static int __devinit static int
fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -1130,7 +1130,7 @@ fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
} }
static void __devexit static void
fritz_remove_pci(struct pci_dev *pdev) fritz_remove_pci(struct pci_dev *pdev)
{ {
struct fritzcard *card = pci_get_drvdata(pdev); struct fritzcard *card = pci_get_drvdata(pdev);
@ -1142,7 +1142,7 @@ fritz_remove_pci(struct pci_dev *pdev)
pr_info("%s: drvdata already removed\n", __func__); pr_info("%s: drvdata already removed\n", __func__);
} }
static struct pci_device_id fcpci_ids[] __devinitdata = { static struct pci_device_id fcpci_ids[] = {
{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID, { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID,
0, 0, (unsigned long) "Fritz!Card PCI"}, 0, 0, (unsigned long) "Fritz!Card PCI"},
{ PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID, { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID,
@ -1154,7 +1154,7 @@ MODULE_DEVICE_TABLE(pci, fcpci_ids);
static struct pci_driver fcpci_driver = { static struct pci_driver fcpci_driver = {
.name = "fcpci", .name = "fcpci",
.probe = fritzpci_probe, .probe = fritzpci_probe,
.remove = __devexit_p(fritz_remove_pci), .remove = fritz_remove_pci,
.id_table = fcpci_ids, .id_table = fcpci_ids,
}; };

6
drivers/isdn/hardware/mISDN/hfcmulti.c
View File

@ -5274,7 +5274,7 @@ free_card:
return ret_err; return ret_err;
} }
static void __devexit hfc_remove_pci(struct pci_dev *pdev) static void hfc_remove_pci(struct pci_dev *pdev)
{ {
struct hfc_multi *card = pci_get_drvdata(pdev); struct hfc_multi *card = pci_get_drvdata(pdev);
u_long flags; u_long flags;
@ -5351,7 +5351,7 @@ static const struct hm_map hfcm_map[] = {
#undef H #undef H
#define H(x) ((unsigned long)&hfcm_map[x]) #define H(x) ((unsigned long)&hfcm_map[x])
static struct pci_device_id hfmultipci_ids[] __devinitdata = { static struct pci_device_id hfmultipci_ids[] = {
/* Cards with HFC-4S Chip */ /* Cards with HFC-4S Chip */
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD, { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
@ -5472,7 +5472,7 @@ hfcmulti_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
static struct pci_driver hfcmultipci_driver = { static struct pci_driver hfcmultipci_driver = {
.name = "hfc_multi", .name = "hfc_multi",
.probe = hfcmulti_probe, .probe = hfcmulti_probe,
.remove = __devexit_p(hfc_remove_pci), .remove = hfc_remove_pci,
.id_table = hfmultipci_ids, .id_table = hfmultipci_ids,
}; };

6
drivers/isdn/hardware/mISDN/hfcpci.c
View File

@ -2215,7 +2215,7 @@ static struct pci_device_id hfc_ids[] =
{}, {},
}; };
static int __devinit static int
hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -2246,7 +2246,7 @@ hfc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
} }
static void __devexit static void
hfc_remove_pci(struct pci_dev *pdev) hfc_remove_pci(struct pci_dev *pdev)
{ {
struct hfc_pci *card = pci_get_drvdata(pdev); struct hfc_pci *card = pci_get_drvdata(pdev);
@ -2263,7 +2263,7 @@ hfc_remove_pci(struct pci_dev *pdev)
static struct pci_driver hfc_driver = { static struct pci_driver hfc_driver = {
.name = "hfcpci", .name = "hfcpci",
.probe = hfc_probe, .probe = hfc_probe,
.remove = __devexit_p(hfc_remove_pci), .remove = hfc_remove_pci,
.id_table = hfc_ids, .id_table = hfc_ids,
}; };

16
drivers/isdn/hardware/mISDN/mISDNinfineon.c
View File

@ -125,7 +125,7 @@ struct inf_hw {
#define PCI_SUBVENDOR_SEDLBAUER_PCI 0x53 #define PCI_SUBVENDOR_SEDLBAUER_PCI 0x53
#define PCI_SUB_ID_SEDLBAUER 0x01 #define PCI_SUB_ID_SEDLBAUER 0x01
static struct pci_device_id infineon_ids[] __devinitdata = { static struct pci_device_id infineon_ids[] = {
{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20), INF_DIVA20 }, { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20), INF_DIVA20 },
{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20_U), INF_DIVA20U }, { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20_U), INF_DIVA20U },
{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA201), INF_DIVA201 }, { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA201), INF_DIVA201 },
@ -603,7 +603,7 @@ inf_ctrl(struct inf_hw *hw, u32 cmd, u_long arg)
return ret; return ret;
} }
static int __devinit static int
init_irq(struct inf_hw *hw) init_irq(struct inf_hw *hw)
{ {
int ret, cnt = 3; int ret, cnt = 3;
@ -662,7 +662,7 @@ release_io(struct inf_hw *hw)
} }
} }
static int __devinit static int
setup_io(struct inf_hw *hw) setup_io(struct inf_hw *hw)
{ {
int err = 0; int err = 0;
@ -896,7 +896,7 @@ release_card(struct inf_hw *card) {
inf_cnt--; inf_cnt--;
} }
static int __devinit static int
setup_instance(struct inf_hw *card) setup_instance(struct inf_hw *card)
{ {
int err; int err;
@ -1060,7 +1060,7 @@ static const struct inf_cinfo inf_card_info[] = {
} }
}; };
static const struct inf_cinfo * __devinit static const struct inf_cinfo *
get_card_info(enum inf_types typ) get_card_info(enum inf_types typ)
{ {
const struct inf_cinfo *ci = inf_card_info; const struct inf_cinfo *ci = inf_card_info;
@ -1073,7 +1073,7 @@ get_card_info(enum inf_types typ)
return NULL; return NULL;
} }
static int __devinit static int
inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -1135,7 +1135,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
} }
static void __devexit static void
inf_remove(struct pci_dev *pdev) inf_remove(struct pci_dev *pdev)
{ {
struct inf_hw *card = pci_get_drvdata(pdev); struct inf_hw *card = pci_get_drvdata(pdev);
@ -1149,7 +1149,7 @@ inf_remove(struct pci_dev *pdev)
static struct pci_driver infineon_driver = { static struct pci_driver infineon_driver = {
.name = "ISDN Infineon pci", .name = "ISDN Infineon pci",
.probe = inf_probe, .probe = inf_probe,
.remove = __devexit_p(inf_remove), .remove = inf_remove,
.id_table = infineon_ids, .id_table = infineon_ids,
}; };

10
drivers/isdn/hardware/mISDN/netjet.c
View File

@ -1008,7 +1008,7 @@ nj_setup(struct tiger_hw *card)
} }
static int __devinit static int
setup_instance(struct tiger_hw *card) setup_instance(struct tiger_hw *card)
{ {
int i, err; int i, err;
@ -1059,7 +1059,7 @@ error:
return err; return err;
} }
static int __devinit static int
nj_probe(struct pci_dev *pdev, const struct pci_device_id *ent) nj_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -1124,7 +1124,7 @@ nj_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
static void __devexit nj_remove(struct pci_dev *pdev) static void nj_remove(struct pci_dev *pdev)
{ {
struct tiger_hw *card = pci_get_drvdata(pdev); struct tiger_hw *card = pci_get_drvdata(pdev);
@ -1137,7 +1137,7 @@ static void __devexit nj_remove(struct pci_dev *pdev)
/* We cannot select cards with PCI_SUB... IDs, since here are cards with /* We cannot select cards with PCI_SUB... IDs, since here are cards with
* SUB IDs set to PCI_ANY_ID, so we need to match all and reject * SUB IDs set to PCI_ANY_ID, so we need to match all and reject
* known other cards which not work with this driver - see probe function */ * known other cards which not work with this driver - see probe function */
static struct pci_device_id nj_pci_ids[] __devinitdata = { static struct pci_device_id nj_pci_ids[] = {
{ PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ } { }
@ -1147,7 +1147,7 @@ MODULE_DEVICE_TABLE(pci, nj_pci_ids);
static struct pci_driver nj_driver = { static struct pci_driver nj_driver = {
.name = "netjet", .name = "netjet",
.probe = nj_probe, .probe = nj_probe,
.remove = __devexit_p(nj_remove), .remove = nj_remove,
.id_table = nj_pci_ids, .id_table = nj_pci_ids,
}; };

14
drivers/isdn/hardware/mISDN/speedfax.c
View File

@ -282,7 +282,7 @@ sfax_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg)
return err; return err;
} }
static int __devinit static int
init_card(struct sfax_hw *sf) init_card(struct sfax_hw *sf)
{ {
int ret, cnt = 3; int ret, cnt = 3;
@ -321,7 +321,7 @@ init_card(struct sfax_hw *sf)
} }
static int __devinit static int
setup_speedfax(struct sfax_hw *sf) setup_speedfax(struct sfax_hw *sf)
{ {
u_long flags; u_long flags;
@ -371,7 +371,7 @@ release_card(struct sfax_hw *card) {
sfax_cnt--; sfax_cnt--;
} }
static int __devinit static int
setup_instance(struct sfax_hw *card) setup_instance(struct sfax_hw *card)
{ {
const struct firmware *firmware; const struct firmware *firmware;
@ -451,7 +451,7 @@ error_fw:
return err; return err;
} }
static int __devinit static int
sfaxpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) sfaxpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -480,7 +480,7 @@ sfaxpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
} }
static void __devexit static void
sfax_remove_pci(struct pci_dev *pdev) sfax_remove_pci(struct pci_dev *pdev)
{ {
struct sfax_hw *card = pci_get_drvdata(pdev); struct sfax_hw *card = pci_get_drvdata(pdev);
@ -491,7 +491,7 @@ sfax_remove_pci(struct pci_dev *pdev)
pr_debug("%s: drvdata already removed\n", __func__); pr_debug("%s: drvdata already removed\n", __func__);
} }
static struct pci_device_id sfaxpci_ids[] __devinitdata = { static struct pci_device_id sfaxpci_ids[] = {
{ PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
PCI_SUBVENDOR_SPEEDFAX_PYRAMID, PCI_SUB_ID_SEDLBAUER, PCI_SUBVENDOR_SPEEDFAX_PYRAMID, PCI_SUB_ID_SEDLBAUER,
0, 0, (unsigned long) "Pyramid Speedfax + PCI" 0, 0, (unsigned long) "Pyramid Speedfax + PCI"
@ -507,7 +507,7 @@ MODULE_DEVICE_TABLE(pci, sfaxpci_ids);
static struct pci_driver sfaxpci_driver = { static struct pci_driver sfaxpci_driver = {
.name = "speedfax+ pci", .name = "speedfax+ pci",
.probe = sfaxpci_probe, .probe = sfaxpci_probe,
.remove = __devexit_p(sfax_remove_pci), .remove = sfax_remove_pci,
.id_table = sfaxpci_ids, .id_table = sfaxpci_ids,
}; };

6
drivers/isdn/hardware/mISDN/w6692.c
View File

@ -1355,7 +1355,7 @@ error_setup:
return err; return err;
} }
static int __devinit static int
w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent) w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -1387,7 +1387,7 @@ w6692_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
} }
static void __devexit static void
w6692_remove_pci(struct pci_dev *pdev) w6692_remove_pci(struct pci_dev *pdev)
{ {
struct w6692_hw *card = pci_get_drvdata(pdev); struct w6692_hw *card = pci_get_drvdata(pdev);
@ -1414,7 +1414,7 @@ MODULE_DEVICE_TABLE(pci, w6692_ids);
static struct pci_driver w6692_driver = { static struct pci_driver w6692_driver = {
.name = "w6692", .name = "w6692",
.probe = w6692_probe, .probe = w6692_probe,
.remove = __devexit_p(w6692_remove_pci), .remove = w6692_remove_pci,
.id_table = w6692_ids, .id_table = w6692_ids,
}; };

3
drivers/isdn/hisax/amd7930_fn.c
View File

@ -786,8 +786,7 @@ void Amd7930_init(struct IsdnCardState *cs)
} }
} }
void __devinit void setup_Amd7930(struct IsdnCardState *cs)
setup_Amd7930(struct IsdnCardState *cs)
{ {
INIT_WORK(&cs->tqueue, Amd7930_bh); INIT_WORK(&cs->tqueue, Amd7930_bh);
cs->dbusytimer.function = (void *) dbusy_timer_handler; cs->dbusytimer.function = (void *) dbusy_timer_handler;

9
drivers/isdn/hisax/asuscom.c
View File

@ -295,7 +295,7 @@ Asus_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id asus_ids[] __devinitdata = { static struct isapnp_device_id asus_ids[] = {
{ ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), { ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688),
ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688),
(unsigned long) "Asus1688 PnP" }, (unsigned long) "Asus1688 PnP" },
@ -311,12 +311,11 @@ static struct isapnp_device_id asus_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &asus_ids[0]; static struct isapnp_device_id *ipid = &asus_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit int setup_asuscom(struct IsdnCard *card)
setup_asuscom(struct IsdnCard *card)
{ {
int bytecnt; int bytecnt;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

3
drivers/isdn/hisax/avm_a1.c
View File

@ -177,8 +177,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
int __devinit int setup_avm_a1(struct IsdnCard *card)
setup_avm_a1(struct IsdnCard *card)
{ {
u_char val; u_char val;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

2
drivers/isdn/hisax/avm_a1p.c
View File

@ -213,7 +213,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return 0; return 0;
} }
int __devinit setup_avm_a1_pcmcia(struct IsdnCard *card) int setup_avm_a1_pcmcia(struct IsdnCard *card)
{ {
u_char model, vers; u_char model, vers;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

17
drivers/isdn/hisax/avm_pci.c
View File

@ -718,7 +718,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit avm_setup_rest(struct IsdnCardState *cs) static int avm_setup_rest(struct IsdnCardState *cs)
{ {
u_int val, ver; u_int val, ver;
@ -770,16 +770,16 @@ static int __devinit avm_setup_rest(struct IsdnCardState *cs)
#ifndef __ISAPNP__ #ifndef __ISAPNP__
static int __devinit avm_pnp_setup(struct IsdnCardState *cs) static int avm_pnp_setup(struct IsdnCardState *cs)
{ {
return (1); /* no-op: success */ return (1); /* no-op: success */
} }
#else #else
static struct pnp_card *pnp_avm_c __devinitdata = NULL; static struct pnp_card *pnp_avm_c = NULL;
static int __devinit avm_pnp_setup(struct IsdnCardState *cs) static int avm_pnp_setup(struct IsdnCardState *cs)
{ {
struct pnp_dev *pnp_avm_d = NULL; struct pnp_dev *pnp_avm_d = NULL;
@ -825,16 +825,16 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
#ifndef CONFIG_PCI #ifndef CONFIG_PCI
static int __devinit avm_pci_setup(struct IsdnCardState *cs) static int avm_pci_setup(struct IsdnCardState *cs)
{ {
return (1); /* no-op: success */ return (1); /* no-op: success */
} }
#else #else
static struct pci_dev *dev_avm __devinitdata = NULL; static struct pci_dev *dev_avm = NULL;
static int __devinit avm_pci_setup(struct IsdnCardState *cs) static int avm_pci_setup(struct IsdnCardState *cs)
{ {
if ((dev_avm = hisax_find_pci_device(PCI_VENDOR_ID_AVM, if ((dev_avm = hisax_find_pci_device(PCI_VENDOR_ID_AVM,
PCI_DEVICE_ID_AVM_A1, dev_avm))) { PCI_DEVICE_ID_AVM_A1, dev_avm))) {
@ -867,8 +867,7 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs)
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
int __devinit int setup_avm_pcipnp(struct IsdnCard *card)
setup_avm_pcipnp(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

12
drivers/isdn/hisax/avma1_cs.c
View File

@ -38,11 +38,11 @@ module_param(isdnprot, int, 0);
/*====================================================================*/ /*====================================================================*/
static int avma1cs_config(struct pcmcia_device *link) __devinit; static int avma1cs_config(struct pcmcia_device *link);
static void avma1cs_release(struct pcmcia_device *link); static void avma1cs_release(struct pcmcia_device *link);
static void avma1cs_detach(struct pcmcia_device *p_dev) __devexit; static void avma1cs_detach(struct pcmcia_device *p_dev);
static int __devinit avma1cs_probe(struct pcmcia_device *p_dev) static int avma1cs_probe(struct pcmcia_device *p_dev)
{ {
dev_dbg(&p_dev->dev, "avma1cs_attach()\n"); dev_dbg(&p_dev->dev, "avma1cs_attach()\n");
@ -54,7 +54,7 @@ static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
return avma1cs_config(p_dev); return avma1cs_config(p_dev);
} /* avma1cs_attach */ } /* avma1cs_attach */
static void __devexit avma1cs_detach(struct pcmcia_device *link) static void avma1cs_detach(struct pcmcia_device *link)
{ {
dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link); dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link);
avma1cs_release(link); avma1cs_release(link);
@ -72,7 +72,7 @@ static int avma1cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
} }
static int __devinit avma1cs_config(struct pcmcia_device *link) static int avma1cs_config(struct pcmcia_device *link)
{ {
int i = -1; int i = -1;
char devname[128]; char devname[128];
@ -156,7 +156,7 @@ static struct pcmcia_driver avma1cs_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "avma1_cs", .name = "avma1_cs",
.probe = avma1cs_probe, .probe = avma1cs_probe,
.remove = __devexit_p(avma1cs_detach), .remove = avma1cs_detach,
.id_table = avma1cs_ids, .id_table = avma1cs_ids,
}; };

16
drivers/isdn/hisax/bkm_a4t.c
View File

@ -253,10 +253,8 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit a4t_pci_probe(struct pci_dev *dev_a4t, static int a4t_pci_probe(struct pci_dev *dev_a4t, struct IsdnCardState *cs,
struct IsdnCardState *cs, u_int *found, u_int *pci_memaddr)
u_int *found,
u_int *pci_memaddr)
{ {
u16 sub_sys; u16 sub_sys;
u16 sub_vendor; u16 sub_vendor;
@ -275,9 +273,8 @@ static int __devinit a4t_pci_probe(struct pci_dev *dev_a4t,
return (-1); /* continue looping */ return (-1); /* continue looping */
} }
static int __devinit a4t_cs_init(struct IsdnCard *card, static int a4t_cs_init(struct IsdnCard *card, struct IsdnCardState *cs,
struct IsdnCardState *cs, u_int pci_memaddr)
u_int pci_memaddr)
{ {
I20_REGISTER_FILE *pI20_Regs; I20_REGISTER_FILE *pI20_Regs;
@ -323,10 +320,9 @@ static int __devinit a4t_cs_init(struct IsdnCard *card,
return (1); return (1);
} }
static struct pci_dev *dev_a4t __devinitdata = NULL; static struct pci_dev *dev_a4t = NULL;
int __devinit int setup_bkm_a4t(struct IsdnCard *card)
setup_bkm_a4t(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

18
drivers/isdn/hisax/bkm_a8.c
View File

@ -255,8 +255,7 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit static int sct_alloc_io(u_int adr, u_int len)
sct_alloc_io(u_int adr, u_int len)
{ {
if (!request_region(adr, len, "scitel")) { if (!request_region(adr, len, "scitel")) {
printk(KERN_WARNING printk(KERN_WARNING
@ -267,15 +266,14 @@ sct_alloc_io(u_int adr, u_int len)
return (0); return (0);
} }
static struct pci_dev *dev_a8 __devinitdata = NULL; static struct pci_dev *dev_a8 = NULL;
static u16 sub_vendor_id __devinitdata = 0; static u16 sub_vendor_id = 0;
static u16 sub_sys_id __devinitdata = 0; static u16 sub_sys_id = 0;
static u_char pci_bus __devinitdata = 0; static u_char pci_bus = 0;
static u_char pci_device_fn __devinitdata = 0; static u_char pci_device_fn = 0;
static u_char pci_irq __devinitdata = 0; static u_char pci_irq = 0;
int __devinit int setup_sct_quadro(struct IsdnCard *card)
setup_sct_quadro(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

26
drivers/isdn/hisax/config.c
View File

@ -338,11 +338,11 @@ static int io[HISAX_MAX_CARDS] = { 0, };
#define IO0_IO1 #define IO0_IO1
#endif #endif
#ifdef IO0_IO1 #ifdef IO0_IO1
static int io0[HISAX_MAX_CARDS] __devinitdata = { 0, }; static int io0[HISAX_MAX_CARDS] = { 0, };
static int io1[HISAX_MAX_CARDS] __devinitdata = { 0, }; static int io1[HISAX_MAX_CARDS] = { 0, };
#endif #endif
static int irq[HISAX_MAX_CARDS] __devinitdata = { 0, }; static int irq[HISAX_MAX_CARDS] = { 0, };
static int mem[HISAX_MAX_CARDS] __devinitdata = { 0, }; static int mem[HISAX_MAX_CARDS] = { 0, };
static char *id = HiSaxID; static char *id = HiSaxID;
MODULE_DESCRIPTION("ISDN4Linux: Driver for passive ISDN cards"); MODULE_DESCRIPTION("ISDN4Linux: Driver for passive ISDN cards");
@ -852,7 +852,7 @@ static int init_card(struct IsdnCardState *cs)
return 3; return 3;
} }
static int __devinit hisax_cs_setup_card(struct IsdnCard *card) static int hisax_cs_setup_card(struct IsdnCard *card)
{ {
int ret; int ret;
@ -1171,12 +1171,8 @@ outf_cs:
return 0; return 0;
} }
/* Used from an exported function but calls __devinit functions. static int checkcard(int cardnr, char *id, int *busy_flag,
* Tell modpost not to warn (__ref) struct module *lockowner, hisax_setup_func_t card_setup)
*/
static int __ref checkcard(int cardnr, char *id, int *busy_flag,
struct module *lockowner,
hisax_setup_func_t card_setup)
{ {
int ret; int ret;
struct IsdnCard *card = cards + cardnr; struct IsdnCard *card = cards + cardnr;
@ -1547,9 +1543,7 @@ static void __exit HiSax_exit(void)
printk(KERN_INFO "HiSax module removed\n"); printk(KERN_INFO "HiSax module removed\n");
} }
#ifdef CONFIG_HOTPLUG int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card)
int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card)
{ {
u_char ids[16]; u_char ids[16];
int ret = -1; int ret = -1;
@ -1568,9 +1562,7 @@ int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *
error: error:
return ret; return ret;
} }
EXPORT_SYMBOL(hisax_init_pcmcia); EXPORT_SYMBOL(hisax_init_pcmcia);
#endif
EXPORT_SYMBOL(HiSax_closecard); EXPORT_SYMBOL(HiSax_closecard);
@ -1917,7 +1909,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#include <linux/pci.h> #include <linux/pci.h>
static struct pci_device_id hisax_pci_tbl[] __devinitdata __used = { static struct pci_device_id hisax_pci_tbl[] __used = {
#ifdef CONFIG_HISAX_FRITZPCI #ifdef CONFIG_HISAX_FRITZPCI
{PCI_VDEVICE(AVM, PCI_DEVICE_ID_AVM_A1) }, {PCI_VDEVICE(AVM, PCI_DEVICE_ID_AVM_A1) },
#endif #endif

31
drivers/isdn/hisax/diva.c
View File

@ -904,7 +904,7 @@ Diva_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit setup_diva_common(struct IsdnCardState *cs) static int setup_diva_common(struct IsdnCardState *cs)
{ {
int bytecnt; int bytecnt;
u_char val; u_char val;
@ -997,7 +997,7 @@ static int __devinit setup_diva_common(struct IsdnCardState *cs)
#ifdef CONFIG_ISA #ifdef CONFIG_ISA
static int __devinit setup_diva_isa(struct IsdnCard *card) static int setup_diva_isa(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
u_char val; u_char val;
@ -1033,7 +1033,7 @@ static int __devinit setup_diva_isa(struct IsdnCard *card)
#else /* if !CONFIG_ISA */ #else /* if !CONFIG_ISA */
static int __devinit setup_diva_isa(struct IsdnCard *card) static int setup_diva_isa(struct IsdnCard *card)
{ {
return (-1); /* card not found; continue search */ return (-1); /* card not found; continue search */
} }
@ -1041,7 +1041,7 @@ static int __devinit setup_diva_isa(struct IsdnCard *card)
#endif /* CONFIG_ISA */ #endif /* CONFIG_ISA */
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id diva_ids[] __devinitdata = { static struct isapnp_device_id diva_ids[] = {
{ ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),
ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51),
(unsigned long) "Diva picola" }, (unsigned long) "Diva picola" },
@ -1063,10 +1063,10 @@ static struct isapnp_device_id diva_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &diva_ids[0]; static struct isapnp_device_id *ipid = &diva_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
static int __devinit setup_diva_isapnp(struct IsdnCard *card) static int setup_diva_isapnp(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
struct pnp_dev *pnp_d; struct pnp_dev *pnp_d;
@ -1141,7 +1141,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
#else /* if !ISAPNP */ #else /* if !ISAPNP */
static int __devinit setup_diva_isapnp(struct IsdnCard *card) static int setup_diva_isapnp(struct IsdnCard *card)
{ {
return (-1); /* card not found; continue search */ return (-1); /* card not found; continue search */
} }
@ -1149,12 +1149,12 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
#endif /* ISAPNP */ #endif /* ISAPNP */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_dev *dev_diva __devinitdata = NULL; static struct pci_dev *dev_diva = NULL;
static struct pci_dev *dev_diva_u __devinitdata = NULL; static struct pci_dev *dev_diva_u = NULL;
static struct pci_dev *dev_diva201 __devinitdata = NULL; static struct pci_dev *dev_diva201 = NULL;
static struct pci_dev *dev_diva202 __devinitdata = NULL; static struct pci_dev *dev_diva202 = NULL;
static int __devinit setup_diva_pci(struct IsdnCard *card) static int setup_diva_pci(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
@ -1231,15 +1231,14 @@ static int __devinit setup_diva_pci(struct IsdnCard *card)
#else /* if !CONFIG_PCI */ #else /* if !CONFIG_PCI */
static int __devinit setup_diva_pci(struct IsdnCard *card) static int setup_diva_pci(struct IsdnCard *card)
{ {
return (-1); /* card not found; continue search */ return (-1); /* card not found; continue search */
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
int __devinit int setup_diva(struct IsdnCard *card)
setup_diva(struct IsdnCard *card)
{ {
int rc, have_card = 0; int rc, have_card = 0;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

31
drivers/isdn/hisax/elsa.c
View File

@ -831,8 +831,7 @@ probe_elsa(struct IsdnCardState *cs)
return (CARD_portlist[i]); return (CARD_portlist[i]);
} }
static int __devinit static int setup_elsa_isa(struct IsdnCard *card)
setup_elsa_isa(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
u_char val; u_char val;
@ -902,7 +901,7 @@ setup_elsa_isa(struct IsdnCard *card)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id elsa_ids[] __devinitdata = { static struct isapnp_device_id elsa_ids[] = {
{ ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133), { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133),
ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133), ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133),
(unsigned long) "Elsa QS1000" }, (unsigned long) "Elsa QS1000" },
@ -912,12 +911,11 @@ static struct isapnp_device_id elsa_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &elsa_ids[0]; static struct isapnp_device_id *ipid = &elsa_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif /* __ISAPNP__ */ #endif /* __ISAPNP__ */
static int __devinit static int setup_elsa_isapnp(struct IsdnCard *card)
setup_elsa_isapnp(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
@ -994,8 +992,7 @@ setup_elsa_isapnp(struct IsdnCard *card)
return (1); return (1);
} }
static void __devinit static void setup_elsa_pcmcia(struct IsdnCard *card)
setup_elsa_pcmcia(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
u_char val; u_char val;
@ -1027,11 +1024,10 @@ setup_elsa_pcmcia(struct IsdnCard *card)
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_dev *dev_qs1000 __devinitdata = NULL; static struct pci_dev *dev_qs1000 = NULL;
static struct pci_dev *dev_qs3000 __devinitdata = NULL; static struct pci_dev *dev_qs3000 = NULL;
static int __devinit static int setup_elsa_pci(struct IsdnCard *card)
setup_elsa_pci(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
@ -1089,15 +1085,13 @@ setup_elsa_pci(struct IsdnCard *card)
#else #else
static int __devinit static int setup_elsa_pci(struct IsdnCard *card)
setup_elsa_pci(struct IsdnCard *card)
{ {
return (1); return (1);
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
static int __devinit static int setup_elsa_common(struct IsdnCard *card)
setup_elsa_common(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
u_char val; u_char val;
@ -1212,8 +1206,7 @@ setup_elsa_common(struct IsdnCard *card)
return (1); return (1);
} }
int __devinit int setup_elsa(struct IsdnCard *card)
setup_elsa(struct IsdnCard *card)
{ {
int rc; int rc;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

12
drivers/isdn/hisax/elsa_cs.c
View File

@ -62,9 +62,9 @@ MODULE_LICENSE("Dual MPL/GPL");
static int protocol = 2; /* EURO-ISDN Default */ static int protocol = 2; /* EURO-ISDN Default */
module_param(protocol, int, 0); module_param(protocol, int, 0);
static int elsa_cs_config(struct pcmcia_device *link) __devinit; static int elsa_cs_config(struct pcmcia_device *link);
static void elsa_cs_release(struct pcmcia_device *link); static void elsa_cs_release(struct pcmcia_device *link);
static void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit; static void elsa_cs_detach(struct pcmcia_device *p_dev);
typedef struct local_info_t { typedef struct local_info_t {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
@ -72,7 +72,7 @@ typedef struct local_info_t {
int cardnr; int cardnr;
} local_info_t; } local_info_t;
static int __devinit elsa_cs_probe(struct pcmcia_device *link) static int elsa_cs_probe(struct pcmcia_device *link)
{ {
local_info_t *local; local_info_t *local;
@ -90,7 +90,7 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
return elsa_cs_config(link); return elsa_cs_config(link);
} /* elsa_cs_attach */ } /* elsa_cs_attach */
static void __devexit elsa_cs_detach(struct pcmcia_device *link) static void elsa_cs_detach(struct pcmcia_device *link)
{ {
local_info_t *info = link->priv; local_info_t *info = link->priv;
@ -126,7 +126,7 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
return -ENODEV; return -ENODEV;
} }
static int __devinit elsa_cs_config(struct pcmcia_device *link) static int elsa_cs_config(struct pcmcia_device *link)
{ {
int i; int i;
IsdnCard_t icard; IsdnCard_t icard;
@ -210,7 +210,7 @@ static struct pcmcia_driver elsa_cs_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "elsa_cs", .name = "elsa_cs",
.probe = elsa_cs_probe, .probe = elsa_cs_probe,
.remove = __devexit_p(elsa_cs_detach), .remove = elsa_cs_detach,
.id_table = elsa_ids, .id_table = elsa_ids,
.suspend = elsa_suspend, .suspend = elsa_suspend,
.resume = elsa_resume, .resume = elsa_resume,

14
drivers/isdn/hisax/enternow_pci.c
View File

@ -300,8 +300,7 @@ enpci_interrupt(int intno, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit en_pci_probe(struct pci_dev *dev_netjet, static int en_pci_probe(struct pci_dev *dev_netjet, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
if (pci_enable_device(dev_netjet)) if (pci_enable_device(dev_netjet))
return (0); return (0);
@ -326,8 +325,7 @@ static int __devinit en_pci_probe(struct pci_dev *dev_netjet,
return (1); return (1);
} }
static void __devinit en_cs_init(struct IsdnCard *card, static void en_cs_init(struct IsdnCard *card, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA;
cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD
@ -350,8 +348,7 @@ static void __devinit en_cs_init(struct IsdnCard *card,
outb(cs->hw.njet.auxd, cs->hw.njet.auxa); outb(cs->hw.njet.auxd, cs->hw.njet.auxa);
} }
static int __devinit en_cs_init_rest(struct IsdnCard *card, static int en_cs_init_rest(struct IsdnCard *card, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
const int bytecnt = 256; const int bytecnt = 256;
@ -384,11 +381,10 @@ static int __devinit en_cs_init_rest(struct IsdnCard *card,
return (1); return (1);
} }
static struct pci_dev *dev_netjet __devinitdata = NULL; static struct pci_dev *dev_netjet = NULL;
/* called by config.c */ /* called by config.c */
int __devinit int setup_enternow_pci(struct IsdnCard *card)
setup_enternow_pci(struct IsdnCard *card)
{ {
int ret; int ret;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

11
drivers/isdn/hisax/gazel.c
View File

@ -483,8 +483,7 @@ error:
return 1; return 1;
} }
static int __devinit static int setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
{ {
printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n"); printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n");
// we got an irq parameter, assume it is an ISA card // we got an irq parameter, assume it is an ISA card
@ -532,10 +531,9 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_dev *dev_tel __devinitdata = NULL; static struct pci_dev *dev_tel = NULL;
static int __devinit static int setup_gazelpci(struct IsdnCardState *cs)
setup_gazelpci(struct IsdnCardState *cs)
{ {
u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0; u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0;
u_char pci_irq = 0, found; u_char pci_irq = 0, found;
@ -622,8 +620,7 @@ setup_gazelpci(struct IsdnCardState *cs)
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
int __devinit int setup_gazel(struct IsdnCard *card)
setup_gazel(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

16
drivers/isdn/hisax/hfc4s8s_l1.c
View File

@ -1497,7 +1497,7 @@ enable_pci_ports(hfc4s8s_hw *hw)
/* initialise the HFC-4s/8s hardware */ /* initialise the HFC-4s/8s hardware */
/* return 0 on success. */ /* return 0 on success. */
/*************************************/ /*************************************/
static int __devinit static int
setup_instance(hfc4s8s_hw *hw) setup_instance(hfc4s8s_hw *hw)
{ {
int err = -EIO; int err = -EIO;
@ -1585,7 +1585,7 @@ out:
/*****************************************/ /*****************************************/
/* PCI hotplug interface: probe new card */ /* PCI hotplug interface: probe new card */
/*****************************************/ /*****************************************/
static int __devinit static int
hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent) hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = -ENOMEM; int err = -ENOMEM;
@ -1640,7 +1640,7 @@ out:
/**************************************/ /**************************************/
/* PCI hotplug interface: remove card */ /* PCI hotplug interface: remove card */
/**************************************/ /**************************************/
static void __devexit static void
hfc4s8s_remove(struct pci_dev *pdev) hfc4s8s_remove(struct pci_dev *pdev)
{ {
hfc4s8s_hw *hw = pci_get_drvdata(pdev); hfc4s8s_hw *hw = pci_get_drvdata(pdev);
@ -1662,7 +1662,7 @@ hfc4s8s_remove(struct pci_dev *pdev)
static struct pci_driver hfc4s8s_driver = { static struct pci_driver hfc4s8s_driver = {
.name = "hfc4s8s_l1", .name = "hfc4s8s_l1",
.probe = hfc4s8s_probe, .probe = hfc4s8s_probe,
.remove = __devexit_p(hfc4s8s_remove), .remove = hfc4s8s_remove,
.id_table = hfc4s8s_ids, .id_table = hfc4s8s_ids,
}; };
@ -1688,14 +1688,6 @@ hfc4s8s_module_init(void)
} }
printk(KERN_INFO "HFC-4S/8S: found %d cards\n", card_cnt); printk(KERN_INFO "HFC-4S/8S: found %d cards\n", card_cnt);
#if !defined(CONFIG_HOTPLUG)
if (err == 0) {
err = -ENODEV;
pci_unregister_driver(&hfc4s8s_driver);
goto out;
}
#endif
return 0; return 0;
out: out:
return (err); return (err);

4
drivers/isdn/hisax/hfc_pci.c
View File

@ -1632,9 +1632,9 @@ hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
/* this variable is used as card index when more than one cards are present */ /* this variable is used as card index when more than one cards are present */
static struct pci_dev *dev_hfcpci __devinitdata = NULL; static struct pci_dev *dev_hfcpci = NULL;
int __devinit int
setup_hfcpci(struct IsdnCard *card) setup_hfcpci(struct IsdnCard *card)
{ {
u_long flags; u_long flags;

9
drivers/isdn/hisax/hfc_sx.c
View File

@ -1381,19 +1381,18 @@ hfcsx_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id hfc_ids[] __devinitdata = { static struct isapnp_device_id hfc_ids[] = {
{ ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2620), { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2620),
ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2620), ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2620),
(unsigned long) "Teles 16.3c2" }, (unsigned long) "Teles 16.3c2" },
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &hfc_ids[0]; static struct isapnp_device_id *ipid = &hfc_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit int setup_hfcsx(struct IsdnCard *card)
setup_hfcsx(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

9
drivers/isdn/hisax/hfcscard.c
View File

@ -136,7 +136,7 @@ hfcs_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id hfc_ids[] __devinitdata = { static struct isapnp_device_id hfc_ids[] = {
{ ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), { ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),
ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114),
(unsigned long) "Acer P10" }, (unsigned long) "Acer P10" },
@ -161,12 +161,11 @@ static struct isapnp_device_id hfc_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &hfc_ids[0]; static struct isapnp_device_id *ipid = &hfc_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit int setup_hfcs(struct IsdnCard *card)
setup_hfcs(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

22
drivers/isdn/hisax/hisax_fcpcipnp.c
View File

@ -70,7 +70,7 @@ static struct pci_device_id fcpci_ids[] = {
MODULE_DEVICE_TABLE(pci, fcpci_ids); MODULE_DEVICE_TABLE(pci, fcpci_ids);
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_device_id fcpnp_ids[] __devinitdata = { static struct pnp_device_id fcpnp_ids[] = {
{ {
.id = "AVM0900", .id = "AVM0900",
.driver_data = (unsigned long) "Fritz!Card PnP", .driver_data = (unsigned long) "Fritz!Card PnP",
@ -712,7 +712,7 @@ static inline void fcpci_init(struct fritz_adapter *adapter)
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter) static int fcpcipnp_setup(struct fritz_adapter *adapter)
{ {
u32 val = 0; u32 val = 0;
int retval; int retval;
@ -825,7 +825,7 @@ err:
return retval; return retval;
} }
static void __devexit fcpcipnp_release(struct fritz_adapter *adapter) static void fcpcipnp_release(struct fritz_adapter *adapter)
{ {
DBG(1, ""); DBG(1, "");
@ -836,8 +836,7 @@ static void __devexit fcpcipnp_release(struct fritz_adapter *adapter)
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
static struct fritz_adapter * __devinit static struct fritz_adapter *new_adapter(void)
new_adapter(void)
{ {
struct fritz_adapter *adapter; struct fritz_adapter *adapter;
struct hisax_b_if *b_if[2]; struct hisax_b_if *b_if[2];
@ -876,8 +875,7 @@ static void delete_adapter(struct fritz_adapter *adapter)
kfree(adapter); kfree(adapter);
} }
static int __devinit fcpci_probe(struct pci_dev *pdev, static int fcpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
struct fritz_adapter *adapter; struct fritz_adapter *adapter;
int retval; int retval;
@ -917,7 +915,7 @@ err:
} }
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) static int fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
{ {
struct fritz_adapter *adapter; struct fritz_adapter *adapter;
int retval; int retval;
@ -959,7 +957,7 @@ err:
return retval; return retval;
} }
static void __devexit fcpnp_remove(struct pnp_dev *pdev) static void fcpnp_remove(struct pnp_dev *pdev)
{ {
struct fritz_adapter *adapter = pnp_get_drvdata(pdev); struct fritz_adapter *adapter = pnp_get_drvdata(pdev);
@ -973,12 +971,12 @@ static void __devexit fcpnp_remove(struct pnp_dev *pdev)
static struct pnp_driver fcpnp_driver = { static struct pnp_driver fcpnp_driver = {
.name = "fcpnp", .name = "fcpnp",
.probe = fcpnp_probe, .probe = fcpnp_probe,
.remove = __devexit_p(fcpnp_remove), .remove = fcpnp_remove,
.id_table = fcpnp_ids, .id_table = fcpnp_ids,
}; };
#endif #endif
static void __devexit fcpci_remove(struct pci_dev *pdev) static void fcpci_remove(struct pci_dev *pdev)
{ {
struct fritz_adapter *adapter = pci_get_drvdata(pdev); struct fritz_adapter *adapter = pci_get_drvdata(pdev);
@ -990,7 +988,7 @@ static void __devexit fcpci_remove(struct pci_dev *pdev)
static struct pci_driver fcpci_driver = { static struct pci_driver fcpci_driver = {
.name = "fcpci", .name = "fcpci",
.probe = fcpci_probe, .probe = fcpci_probe,
.remove = __devexit_p(fcpci_remove), .remove = fcpci_remove,
.id_table = fcpci_ids, .id_table = fcpci_ids,
}; };

3
drivers/isdn/hisax/icc.c
View File

@ -673,8 +673,7 @@ clear_pending_icc_ints(struct IsdnCardState *cs)
cs->writeisac(cs, ICC_MASK, 0xFF); cs->writeisac(cs, ICC_MASK, 0xFF);
} }
void __devinit void setup_icc(struct IsdnCardState *cs)
setup_icc(struct IsdnCardState *cs)
{ {
INIT_WORK(&cs->tqueue, icc_bh); INIT_WORK(&cs->tqueue, icc_bh);
cs->dbusytimer.function = (void *) dbusy_timer_handler; cs->dbusytimer.function = (void *) dbusy_timer_handler;

7
drivers/isdn/hisax/isac.c
View File

@ -24,11 +24,11 @@
#define DBUSY_TIMER_VALUE 80 #define DBUSY_TIMER_VALUE 80
#define ARCOFI_USE 1 #define ARCOFI_USE 1
static char *ISACVer[] __devinitdata = static char *ISACVer[] =
{"2086/2186 V1.1", "2085 B1", "2085 B2", {"2086/2186 V1.1", "2085 B1", "2085 B2",
"2085 V2.3"}; "2085 V2.3"};
void __devinit ISACVersion(struct IsdnCardState *cs, char *s) void ISACVersion(struct IsdnCardState *cs, char *s)
{ {
int val; int val;
@ -669,8 +669,7 @@ void clear_pending_isac_ints(struct IsdnCardState *cs)
cs->writeisac(cs, ISAC_MASK, 0xFF); cs->writeisac(cs, ISAC_MASK, 0xFF);
} }
void __devinit void setup_isac(struct IsdnCardState *cs)
setup_isac(struct IsdnCardState *cs)
{ {
INIT_WORK(&cs->tqueue, isac_bh); INIT_WORK(&cs->tqueue, isac_bh);
cs->dbusytimer.function = (void *) dbusy_timer_handler; cs->dbusytimer.function = (void *) dbusy_timer_handler;

5
drivers/isdn/hisax/isurf.c
View File

@ -194,11 +194,10 @@ isurf_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit int setup_isurf(struct IsdnCard *card)
setup_isurf(struct IsdnCard *card)
{ {
int ver; int ver;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

9
drivers/isdn/hisax/ix1_micro.c
View File

@ -209,7 +209,7 @@ ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id itk_ids[] __devinitdata = { static struct isapnp_device_id itk_ids[] = {
{ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
(unsigned long) "ITK micro 2" }, (unsigned long) "ITK micro 2" },
@ -219,13 +219,12 @@ static struct isapnp_device_id itk_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &itk_ids[0]; static struct isapnp_device_id *ipid = &itk_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit int setup_ix1micro(struct IsdnCard *card)
setup_ix1micro(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

3
drivers/isdn/hisax/mic.c
View File

@ -187,8 +187,7 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
int __devinit int setup_mic(struct IsdnCard *card)
setup_mic(struct IsdnCard *card)
{ {
int bytecnt; int bytecnt;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

6
drivers/isdn/hisax/niccy.c
View File

@ -223,10 +223,10 @@ static int niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit setup_niccy(struct IsdnCard *card) int setup_niccy(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];
@ -298,7 +298,7 @@ int __devinit setup_niccy(struct IsdnCard *card)
} }
} else { } else {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_dev *niccy_dev __devinitdata; static struct pci_dev *niccy_dev;
u_int pci_ioaddr; u_int pci_ioaddr;
cs->subtyp = 0; cs->subtyp = 0;

14
drivers/isdn/hisax/nj_s.c
View File

@ -148,8 +148,7 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit njs_pci_probe(struct pci_dev *dev_netjet, static int njs_pci_probe(struct pci_dev *dev_netjet, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
u32 cfg; u32 cfg;
@ -187,8 +186,7 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
return (1); return (1);
} }
static int __devinit njs_cs_init(struct IsdnCard *card, static int njs_cs_init(struct IsdnCard *card, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA;
@ -225,8 +223,7 @@ static int __devinit njs_cs_init(struct IsdnCard *card,
return 1; /* end loop */ return 1; /* end loop */
} }
static int __devinit njs_cs_init_rest(struct IsdnCard *card, static int njs_cs_init_rest(struct IsdnCard *card, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
const int bytecnt = 256; const int bytecnt = 256;
@ -256,10 +253,9 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card,
return (1); return (1);
} }
static struct pci_dev *dev_netjet __devinitdata = NULL; static struct pci_dev *dev_netjet = NULL;
int __devinit int setup_netjet_s(struct IsdnCard *card)
setup_netjet_s(struct IsdnCard *card)
{ {
int ret; int ret;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

14
drivers/isdn/hisax/nj_u.c
View File

@ -128,8 +128,7 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, static int nju_pci_probe(struct pci_dev *dev_netjet, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
if (pci_enable_device(dev_netjet)) if (pci_enable_device(dev_netjet))
return (0); return (0);
@ -148,8 +147,7 @@ static int __devinit nju_pci_probe(struct pci_dev *dev_netjet,
return (1); return (1);
} }
static int __devinit nju_cs_init(struct IsdnCard *card, static int nju_cs_init(struct IsdnCard *card, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA;
cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF;
@ -187,8 +185,7 @@ static int __devinit nju_cs_init(struct IsdnCard *card,
return 1; /* end loop */ return 1; /* end loop */
} }
static int __devinit nju_cs_init_rest(struct IsdnCard *card, static int nju_cs_init_rest(struct IsdnCard *card, struct IsdnCardState *cs)
struct IsdnCardState *cs)
{ {
const int bytecnt = 256; const int bytecnt = 256;
@ -219,10 +216,9 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card,
return (1); return (1);
} }
static struct pci_dev *dev_netjet __devinitdata = NULL; static struct pci_dev *dev_netjet = NULL;
int __devinit int setup_netjet_u(struct IsdnCard *card)
setup_netjet_u(struct IsdnCard *card)
{ {
int ret; int ret;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

3
drivers/isdn/hisax/s0box.c
View File

@ -210,8 +210,7 @@ S0Box_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
int __devinit int setup_s0box(struct IsdnCard *card)
setup_s0box(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

3
drivers/isdn/hisax/saphir.c
View File

@ -240,8 +240,7 @@ saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
int __devinit int setup_saphir(struct IsdnCard *card)
setup_saphir(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

23
drivers/isdn/hisax/sedlbauer.c
View File

@ -517,7 +517,7 @@ Sedl_card_msg(struct IsdnCardState *cs, int mt, void *arg)
} }
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id sedl_ids[] __devinitdata = { static struct isapnp_device_id sedl_ids[] = {
{ ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x01), { ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x01),
ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x01), ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x01),
(unsigned long) "Speed win" }, (unsigned long) "Speed win" },
@ -527,11 +527,10 @@ static struct isapnp_device_id sedl_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &sedl_ids[0]; static struct isapnp_device_id *ipid = &sedl_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
static int __devinit static int setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
struct pnp_dev *pnp_d; struct pnp_dev *pnp_d;
@ -591,18 +590,16 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
} }
#else #else
static int __devinit static int setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
{ {
return -1; return -1;
} }
#endif /* __ISAPNP__ */ #endif /* __ISAPNP__ */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_dev *dev_sedl __devinitdata = NULL; static struct pci_dev *dev_sedl = NULL;
static int __devinit static int setup_sedlbauer_pci(struct IsdnCard *card)
setup_sedlbauer_pci(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
u16 sub_vendor_id, sub_id; u16 sub_vendor_id, sub_id;
@ -667,16 +664,14 @@ setup_sedlbauer_pci(struct IsdnCard *card)
#else #else
static int __devinit static int setup_sedlbauer_pci(struct IsdnCard *card)
setup_sedlbauer_pci(struct IsdnCard *card)
{ {
return (1); return (1);
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
int __devinit int setup_sedlbauer(struct IsdnCard *card)
setup_sedlbauer(struct IsdnCard *card)
{ {
int bytecnt = 8, ver, val, rc; int bytecnt = 8, ver, val, rc;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

12
drivers/isdn/hisax/sedlbauer_cs.c
View File

@ -62,10 +62,10 @@ MODULE_LICENSE("Dual MPL/GPL");
static int protocol = 2; /* EURO-ISDN Default */ static int protocol = 2; /* EURO-ISDN Default */
module_param(protocol, int, 0); module_param(protocol, int, 0);
static int sedlbauer_config(struct pcmcia_device *link) __devinit; static int sedlbauer_config(struct pcmcia_device *link);
static void sedlbauer_release(struct pcmcia_device *link); static void sedlbauer_release(struct pcmcia_device *link);
static void sedlbauer_detach(struct pcmcia_device *p_dev) __devexit; static void sedlbauer_detach(struct pcmcia_device *p_dev);
typedef struct local_info_t { typedef struct local_info_t {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
@ -73,7 +73,7 @@ typedef struct local_info_t {
int cardnr; int cardnr;
} local_info_t; } local_info_t;
static int __devinit sedlbauer_probe(struct pcmcia_device *link) static int sedlbauer_probe(struct pcmcia_device *link)
{ {
local_info_t *local; local_info_t *local;
@ -90,7 +90,7 @@ static int __devinit sedlbauer_probe(struct pcmcia_device *link)
return sedlbauer_config(link); return sedlbauer_config(link);
} /* sedlbauer_attach */ } /* sedlbauer_attach */
static void __devexit sedlbauer_detach(struct pcmcia_device *link) static void sedlbauer_detach(struct pcmcia_device *link)
{ {
dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link); dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link);
@ -110,7 +110,7 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev, void *priv_data)
return pcmcia_request_io(p_dev); return pcmcia_request_io(p_dev);
} }
static int __devinit sedlbauer_config(struct pcmcia_device *link) static int sedlbauer_config(struct pcmcia_device *link)
{ {
int ret; int ret;
IsdnCard_t icard; IsdnCard_t icard;
@ -201,7 +201,7 @@ static struct pcmcia_driver sedlbauer_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "sedlbauer_cs", .name = "sedlbauer_cs",
.probe = sedlbauer_probe, .probe = sedlbauer_probe,
.remove = __devexit_p(sedlbauer_detach), .remove = sedlbauer_detach,
.id_table = sedlbauer_ids, .id_table = sedlbauer_ids,
.suspend = sedlbauer_suspend, .suspend = sedlbauer_suspend,
.resume = sedlbauer_resume, .resume = sedlbauer_resume,

6
drivers/isdn/hisax/sportster.c
View File

@ -183,8 +183,7 @@ Sportster_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static int __devinit static int get_io_range(struct IsdnCardState *cs)
get_io_range(struct IsdnCardState *cs)
{ {
int i, j, adr; int i, j, adr;
@ -208,8 +207,7 @@ get_io_range(struct IsdnCardState *cs)
} }
} }
int __devinit int setup_sportster(struct IsdnCard *card)
setup_sportster(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

3
drivers/isdn/hisax/teleint.c
View File

@ -259,8 +259,7 @@ TeleInt_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
int __devinit int setup_TeleInt(struct IsdnCard *card)
setup_TeleInt(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

3
drivers/isdn/hisax/teles0.c
View File

@ -263,8 +263,7 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
int __devinit int setup_teles0(struct IsdnCard *card)
setup_teles0(struct IsdnCard *card)
{ {
u_char val; u_char val;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

9
drivers/isdn/hisax/teles3.c
View File

@ -253,7 +253,7 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)
#ifdef __ISAPNP__ #ifdef __ISAPNP__
static struct isapnp_device_id teles_ids[] __devinitdata = { static struct isapnp_device_id teles_ids[] = {
{ ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110), { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110),
ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110), ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110),
(unsigned long) "Teles 16.3 PnP" }, (unsigned long) "Teles 16.3 PnP" },
@ -266,12 +266,11 @@ static struct isapnp_device_id teles_ids[] __devinitdata = {
{ 0, } { 0, }
}; };
static struct isapnp_device_id *ipid __devinitdata = &teles_ids[0]; static struct isapnp_device_id *ipid = &teles_ids[0];
static struct pnp_card *pnp_c __devinitdata = NULL; static struct pnp_card *pnp_c = NULL;
#endif #endif
int __devinit int setup_teles3(struct IsdnCard *card)
setup_teles3(struct IsdnCard *card)
{ {
u_char val; u_char val;
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;

12
drivers/isdn/hisax/teles_cs.c
View File

@ -43,9 +43,9 @@ MODULE_LICENSE("GPL");
static int protocol = 2; /* EURO-ISDN Default */ static int protocol = 2; /* EURO-ISDN Default */
module_param(protocol, int, 0); module_param(protocol, int, 0);
static int teles_cs_config(struct pcmcia_device *link) __devinit; static int teles_cs_config(struct pcmcia_device *link);
static void teles_cs_release(struct pcmcia_device *link); static void teles_cs_release(struct pcmcia_device *link);
static void teles_detach(struct pcmcia_device *p_dev) __devexit; static void teles_detach(struct pcmcia_device *p_dev);
typedef struct local_info_t { typedef struct local_info_t {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
@ -53,7 +53,7 @@ typedef struct local_info_t {
int cardnr; int cardnr;
} local_info_t; } local_info_t;
static int __devinit teles_probe(struct pcmcia_device *link) static int teles_probe(struct pcmcia_device *link)
{ {
local_info_t *local; local_info_t *local;
@ -72,7 +72,7 @@ static int __devinit teles_probe(struct pcmcia_device *link)
return teles_cs_config(link); return teles_cs_config(link);
} /* teles_attach */ } /* teles_attach */
static void __devexit teles_detach(struct pcmcia_device *link) static void teles_detach(struct pcmcia_device *link)
{ {
local_info_t *info = link->priv; local_info_t *info = link->priv;
@ -108,7 +108,7 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, void *priv_data)
return -ENODEV; return -ENODEV;
} }
static int __devinit teles_cs_config(struct pcmcia_device *link) static int teles_cs_config(struct pcmcia_device *link)
{ {
int i; int i;
IsdnCard_t icard; IsdnCard_t icard;
@ -192,7 +192,7 @@ static struct pcmcia_driver teles_cs_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "teles_cs", .name = "teles_cs",
.probe = teles_probe, .probe = teles_probe,
.remove = __devexit_p(teles_detach), .remove = teles_detach,
.id_table = teles_ids, .id_table = teles_ids,
.suspend = teles_suspend, .suspend = teles_suspend,
.resume = teles_resume, .resume = teles_resume,

5
drivers/isdn/hisax/telespci.c
View File

@ -283,10 +283,9 @@ TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg)
return (0); return (0);
} }
static struct pci_dev *dev_tel __devinitdata = NULL; static struct pci_dev *dev_tel = NULL;
int __devinit int setup_telespci(struct IsdnCard *card)
setup_telespci(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

5
drivers/isdn/hisax/w6692.c
View File

@ -991,10 +991,9 @@ w6692_card_msg(struct IsdnCardState *cs, int mt, void *arg)
static int id_idx; static int id_idx;
static struct pci_dev *dev_w6692 __devinitdata = NULL; static struct pci_dev *dev_w6692 = NULL;
int __devinit int setup_w6692(struct IsdnCard *card)
setup_w6692(struct IsdnCard *card)
{ {
struct IsdnCardState *cs = card->cs; struct IsdnCardState *cs = card->cs;
char tmp[64]; char tmp[64];

8
drivers/isdn/hysdn/hysdn_init.c
View File

@ -56,8 +56,8 @@ static hysdn_card *card_last = NULL; /* pointer to first card */
/* is assumed and the module will not be kept in memory. */ /* is assumed and the module will not be kept in memory. */
/****************************************************************************/ /****************************************************************************/
static int __devinit hysdn_pci_init_one(struct pci_dev *akt_pcidev, static int hysdn_pci_init_one(struct pci_dev *akt_pcidev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
hysdn_card *card; hysdn_card *card;
int rc; int rc;
@ -109,7 +109,7 @@ err_out:
return rc; return rc;
} }
static void __devexit hysdn_pci_remove_one(struct pci_dev *akt_pcidev) static void hysdn_pci_remove_one(struct pci_dev *akt_pcidev)
{ {
hysdn_card *card = pci_get_drvdata(akt_pcidev); hysdn_card *card = pci_get_drvdata(akt_pcidev);
@ -147,7 +147,7 @@ static struct pci_driver hysdn_pci_driver = {
.name = "hysdn", .name = "hysdn",
.id_table = hysdn_pci_tbl, .id_table = hysdn_pci_tbl,
.probe = hysdn_pci_init_one, .probe = hysdn_pci_init_one,
.remove = __devexit_p(hysdn_pci_remove_one), .remove = hysdn_pci_remove_one,
}; };
static int hysdn_have_procfs; static int hysdn_have_procfs;

4
drivers/isdn/mISDN/core.c
View File

@ -140,7 +140,6 @@ static struct device_attribute mISDN_dev_attrs[] = {
{} {}
}; };
#ifdef CONFIG_HOTPLUG
static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env) static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct mISDNdevice *mdev = dev_to_mISDN(dev); struct mISDNdevice *mdev = dev_to_mISDN(dev);
@ -153,7 +152,6 @@ static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0; return 0;
} }
#endif
static void mISDN_class_release(struct class *cls) static void mISDN_class_release(struct class *cls)
{ {
@ -163,9 +161,7 @@ static void mISDN_class_release(struct class *cls)
static struct class mISDN_class = { static struct class mISDN_class = {
.name = "mISDN", .name = "mISDN",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_HOTPLUG
.dev_uevent = mISDN_uevent, .dev_uevent = mISDN_uevent,
#endif
.dev_attrs = mISDN_dev_attrs, .dev_attrs = mISDN_dev_attrs,
.dev_release = mISDN_dev_release, .dev_release = mISDN_dev_release,
.class_release = mISDN_class_release, .class_release = mISDN_class_release,