diff options
Diffstat (limited to 'drivers/isdn/hisax/nj_u.c')
| -rw-r--r-- | drivers/isdn/hisax/nj_u.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index 333484aef425..4e8adbede361 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c | |||
| @@ -128,8 +128,7 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg) | |||
| 128 | return (0); | 128 | return (0); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, | 131 | static int nju_pci_probe(struct pci_dev *dev_netjet, struct IsdnCardState *cs) |
| 132 | struct IsdnCardState *cs) | ||
| 133 | { | 132 | { |
| 134 | if (pci_enable_device(dev_netjet)) | 133 | if (pci_enable_device(dev_netjet)) |
| 135 | return (0); | 134 | return (0); |
| @@ -148,8 +147,7 @@ static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, | |||
| 148 | return (1); | 147 | return (1); |
| 149 | } | 148 | } |
| 150 | 149 | ||
| 151 | static int __devinit nju_cs_init(struct IsdnCard *card, | 150 | static int nju_cs_init(struct IsdnCard *card, struct IsdnCardState *cs) |
| 152 | struct IsdnCardState *cs) | ||
| 153 | { | 151 | { |
| 154 | cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; | 152 | cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; |
| 155 | cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; | 153 | cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; |
| @@ -187,8 +185,7 @@ static int __devinit nju_cs_init(struct IsdnCard *card, | |||
| 187 | return 1; /* end loop */ | 185 | return 1; /* end loop */ |
| 188 | } | 186 | } |
| 189 | 187 | ||
| 190 | static int __devinit nju_cs_init_rest(struct IsdnCard *card, | 188 | static int nju_cs_init_rest(struct IsdnCard *card, struct IsdnCardState *cs) |
| 191 | struct IsdnCardState *cs) | ||
| 192 | { | 189 | { |
| 193 | const int bytecnt = 256; | 190 | const int bytecnt = 256; |
| 194 | 191 | ||
| @@ -219,10 +216,9 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card, | |||
| 219 | return (1); | 216 | return (1); |
| 220 | } | 217 | } |
| 221 | 218 | ||
| 222 | static struct pci_dev *dev_netjet __devinitdata = NULL; | 219 | static struct pci_dev *dev_netjet = NULL; |
| 223 | 220 | ||
| 224 | int __devinit | 221 | int setup_netjet_u(struct IsdnCard *card) |
| 225 | setup_netjet_u(struct IsdnCard *card) | ||
| 226 | { | 222 | { |
| 227 | int ret; | 223 | int ret; |
| 228 | struct IsdnCardState *cs = card->cs; | 224 | struct IsdnCardState *cs = card->cs; |
