Commit 030f963e authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] gazel region handling cleanups

parent c86e1cec
...@@ -451,42 +451,45 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs) ...@@ -451,42 +451,45 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs)
case R647: case R647:
base = cs->hw.gazel.hscx[0]; base = cs->hw.gazel.hscx[0];
for (i = 0x0000; i < 0xC000; i += 0x1000) { for (i = 0x0000; i < 0xC000; i += 0x1000) {
if (check_region(adr = (i + base), len = 16)) if (!request_region(adr = (i + base), len = 16, "gazel")) {
int j;
for (j = 0x0000; j < i; j += 0x1000)
release_region ((j + base), len);
goto error; goto error;
}
} }
if (check_region(adr = (0xC000 + base), len = 1)) if (!request_region(adr = (0xC000 + base), len = 1, "gazel")) {
for (i = 0x0000; i < 0xC000; i += 0x1000)
release_region ((i + base), 16);
goto error; goto error;
}
for (i = 0x0000; i < 0xC000; i += 0x1000)
request_region(i + base, 16, "gazel");
request_region(0xC000 + base, 1, "gazel");
break; break;
case R685: case R685:
if (check_region(adr = cs->hw.gazel.hscx[0], len = 0x100)) if (!request_region(adr = cs->hw.gazel.hscx[0], len = 0x100, "gazel"))
goto error; goto error;
if (check_region(adr = cs->hw.gazel.cfg_reg, len = 0x80)) if (!request_region(adr = cs->hw.gazel.cfg_reg, len = 0x80, "gazel")) {
release_region (cs->hw.gazel.hscx[0], 0x100);
goto error; goto error;
}
request_region(cs->hw.gazel.hscx[0], 0x100, "gazel");
request_region(cs->hw.gazel.cfg_reg, 0x80, "gazel");
break; break;
case R753: case R753:
if (check_region(adr = cs->hw.gazel.ipac, len = 0x8)) if (!request_region(adr = cs->hw.gazel.ipac, len = 0x8, "gazel"))
goto error; goto error;
if (check_region(adr = cs->hw.gazel.cfg_reg, len = 0x80)) if (!request_region(adr = cs->hw.gazel.cfg_reg, len = 0x80, "gazel")) {
release_region (cs->hw.gazel.ipac, 0x8);
goto error; goto error;
}
request_region(cs->hw.gazel.ipac, 0x8, "gazel");
request_region(cs->hw.gazel.cfg_reg, 0x80, "gazel");
break; break;
case R742: case R742:
if (check_region(adr = cs->hw.gazel.ipac, len = 0x8)) if (!request_region(adr = cs->hw.gazel.ipac, len = 0x8, "gazel"))
goto error; goto error;
request_region(cs->hw.gazel.ipac, 0x8, "gazel");
break; break;
} }
......
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