diff options
Diffstat (limited to 'drivers/isdn/hisax/enternow_pci.c')
-rw-r--r-- | drivers/isdn/hisax/enternow_pci.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index b1e38b54ebac..e8d431a8302d 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c | |||
@@ -300,8 +300,7 @@ enpci_interrupt(int intno, void *dev_id) | |||
300 | return IRQ_HANDLED; | 300 | return IRQ_HANDLED; |
301 | } | 301 | } |
302 | 302 | ||
303 | static int __devinit en_pci_probe(struct pci_dev *dev_netjet, | 303 | static int en_pci_probe(struct pci_dev *dev_netjet, struct IsdnCardState *cs) |
304 | struct IsdnCardState *cs) | ||
305 | { | 304 | { |
306 | if (pci_enable_device(dev_netjet)) | 305 | if (pci_enable_device(dev_netjet)) |
307 | return (0); | 306 | return (0); |
@@ -326,8 +325,7 @@ static int __devinit en_pci_probe(struct pci_dev *dev_netjet, | |||
326 | return (1); | 325 | return (1); |
327 | } | 326 | } |
328 | 327 | ||
329 | static void __devinit en_cs_init(struct IsdnCard *card, | 328 | static void en_cs_init(struct IsdnCard *card, struct IsdnCardState *cs) |
330 | struct IsdnCardState *cs) | ||
331 | { | 329 | { |
332 | cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; | 330 | cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; |
333 | cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD | 331 | 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, | |||
350 | outb(cs->hw.njet.auxd, cs->hw.njet.auxa); | 348 | outb(cs->hw.njet.auxd, cs->hw.njet.auxa); |
351 | } | 349 | } |
352 | 350 | ||
353 | static int __devinit en_cs_init_rest(struct IsdnCard *card, | 351 | static int en_cs_init_rest(struct IsdnCard *card, struct IsdnCardState *cs) |
354 | struct IsdnCardState *cs) | ||
355 | { | 352 | { |
356 | const int bytecnt = 256; | 353 | const int bytecnt = 256; |
357 | 354 | ||
@@ -384,11 +381,10 @@ static int __devinit en_cs_init_rest(struct IsdnCard *card, | |||
384 | return (1); | 381 | return (1); |
385 | } | 382 | } |
386 | 383 | ||
387 | static struct pci_dev *dev_netjet __devinitdata = NULL; | 384 | static struct pci_dev *dev_netjet = NULL; |
388 | 385 | ||
389 | /* called by config.c */ | 386 | /* called by config.c */ |
390 | int __devinit | 387 | int setup_enternow_pci(struct IsdnCard *card) |
391 | setup_enternow_pci(struct IsdnCard *card) | ||
392 | { | 388 | { |
393 | int ret; | 389 | int ret; |
394 | struct IsdnCardState *cs = card->cs; | 390 | struct IsdnCardState *cs = card->cs; |