aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/nj_s.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/hisax/nj_s.c')
-rw-r--r--drivers/isdn/hisax/nj_s.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index f36ff69c07e1..32b4bbd18eb9 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -148,8 +148,7 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
148 return (0); 148 return (0);
149} 149}
150 150
151static int __devinit njs_pci_probe(struct pci_dev *dev_netjet, 151static int njs_pci_probe(struct pci_dev *dev_netjet, struct IsdnCardState *cs)
152 struct IsdnCardState *cs)
153{ 152{
154 u32 cfg; 153 u32 cfg;
155 154
@@ -187,8 +186,7 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
187 return (1); 186 return (1);
188} 187}
189 188
190static int __devinit njs_cs_init(struct IsdnCard *card, 189static int njs_cs_init(struct IsdnCard *card, struct IsdnCardState *cs)
191 struct IsdnCardState *cs)
192{ 190{
193 191
194 cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; 192 cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA;
@@ -225,8 +223,7 @@ static int __devinit njs_cs_init(struct IsdnCard *card,
225 return 1; /* end loop */ 223 return 1; /* end loop */
226} 224}
227 225
228static int __devinit njs_cs_init_rest(struct IsdnCard *card, 226static int njs_cs_init_rest(struct IsdnCard *card, struct IsdnCardState *cs)
229 struct IsdnCardState *cs)
230{ 227{
231 const int bytecnt = 256; 228 const int bytecnt = 256;
232 229
@@ -256,10 +253,9 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card,
256 return (1); 253 return (1);
257} 254}
258 255
259static struct pci_dev *dev_netjet __devinitdata = NULL; 256static struct pci_dev *dev_netjet = NULL;
260 257
261int __devinit 258int setup_netjet_s(struct IsdnCard *card)
262setup_netjet_s(struct IsdnCard *card)
263{ 259{
264 int ret; 260 int ret;
265 struct IsdnCardState *cs = card->cs; 261 struct IsdnCardState *cs = card->cs;