Commit 98b0aa47 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] elsa check_region() -> request_region()

parent 19afe6c2
...@@ -598,15 +598,13 @@ check_arcofi(struct IsdnCardState *cs) ...@@ -598,15 +598,13 @@ check_arcofi(struct IsdnCardState *cs)
Elsa_Types[cs->subtyp], Elsa_Types[cs->subtyp],
cs->hw.elsa.base+8); cs->hw.elsa.base+8);
release_region(cs->hw.elsa.base, 8); release_region(cs->hw.elsa.base, 8);
if (check_region(cs->hw.elsa.base, 16)) { if (!request_region(cs->hw.elsa.base, 16,"elsa isdn modem")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %lx-%lx already in use\n", "HiSax: %s config port %lx-%lx already in use\n",
Elsa_Types[cs->subtyp], Elsa_Types[cs->subtyp],
cs->hw.elsa.base + 8, cs->hw.elsa.base + 8,
cs->hw.elsa.base + 16); cs->hw.elsa.base + 16);
} else }
request_region(cs->hw.elsa.base, 16,
"elsa isdn modem");
} else if (cs->subtyp==ELSA_PCC16) { } else if (cs->subtyp==ELSA_PCC16) {
cs->subtyp = ELSA_PCF; cs->subtyp = ELSA_PCF;
printk(KERN_INFO printk(KERN_INFO
...@@ -614,15 +612,13 @@ check_arcofi(struct IsdnCardState *cs) ...@@ -614,15 +612,13 @@ check_arcofi(struct IsdnCardState *cs)
Elsa_Types[cs->subtyp], Elsa_Types[cs->subtyp],
cs->hw.elsa.base+8); cs->hw.elsa.base+8);
release_region(cs->hw.elsa.base, 8); release_region(cs->hw.elsa.base, 8);
if (check_region(cs->hw.elsa.base, 16)) { if (!request_region(cs->hw.elsa.base, 16,"elsa isdn modem")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %lx-%lx already in use\n", "HiSax: %s config port %lx-%lx already in use\n",
Elsa_Types[cs->subtyp], Elsa_Types[cs->subtyp],
cs->hw.elsa.base + 8, cs->hw.elsa.base + 8,
cs->hw.elsa.base + 16); cs->hw.elsa.base + 16);
} else }
request_region(cs->hw.elsa.base, 16,
"elsa isdn modem");
} else } else
printk(KERN_INFO printk(KERN_INFO
"Elsa: %s detected modem at 0x%lx\n", "Elsa: %s detected modem at 0x%lx\n",
...@@ -1066,18 +1062,18 @@ setup_elsa(struct IsdnCard *card) ...@@ -1066,18 +1062,18 @@ setup_elsa(struct IsdnCard *card)
/* In case of the elsa pcmcia card, this region is in use, /* In case of the elsa pcmcia card, this region is in use,
reserved for us by the card manager. So we do not check it reserved for us by the card manager. So we do not check it
here, it would fail. */ here, it would fail. */
if (cs->typ != ISDN_CTYPE_ELSA_PCMCIA && check_region(cs->hw.elsa.base, bytecnt)) { if (cs->typ != ISDN_CTYPE_ELSA_PCMCIA)
if (!request_region(cs->hw.elsa.base, bytecnt, "elsa isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %#lx-%#lx already in use\n", "HiSax: %s config port %#lx-%#lx already in use\n",
CardType[card->typ], CardType[card->typ],
cs->hw.elsa.base, cs->hw.elsa.base,
cs->hw.elsa.base + bytecnt); cs->hw.elsa.base + bytecnt);
return (0); return (0);
} else {
request_region(cs->hw.elsa.base, bytecnt, "elsa isdn");
} }
if ((cs->subtyp == ELSA_QS1000PCI) || (cs->subtyp == ELSA_QS3000PCI)) { if ((cs->subtyp == ELSA_QS1000PCI) || (cs->subtyp == ELSA_QS3000PCI)) {
if (check_region(cs->hw.elsa.cfg, 0x80)) { if (!pci_request_region(cs->hw.elsa.cfg, 0x80, "elsa isdn pci")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s pci port %x-%x already in use\n", "HiSax: %s pci port %x-%x already in use\n",
CardType[card->typ], CardType[card->typ],
...@@ -1085,8 +1081,6 @@ setup_elsa(struct IsdnCard *card) ...@@ -1085,8 +1081,6 @@ setup_elsa(struct IsdnCard *card)
cs->hw.elsa.cfg + 0x80); cs->hw.elsa.cfg + 0x80);
release_region(cs->hw.elsa.base, bytecnt); release_region(cs->hw.elsa.base, bytecnt);
return (0); return (0);
} else {
request_region(cs->hw.elsa.cfg, 0x80, "elsa isdn pci");
} }
} }
#if ARCOFI_USE #if ARCOFI_USE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment