Commit 2a7cc20a authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds

[PATCH] pcmcia: tcic: eleminate deprecated check_region()

From: Randy Dunlap <rddunlap@osdl.org>

tcic: eliminate deprecated check_region();
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarDominik Brodowski <linux@brodo.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 99b38a19
...@@ -344,10 +344,14 @@ static int __init is_active(int s) ...@@ -344,10 +344,14 @@ static int __init is_active(int s)
if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) && if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) &&
(scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) && (scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) &&
(check_region(base, num) != 0) && ((base & 0xfeef) != 0x02e8)) ((base & 0xfeef) != 0x02e8)) {
return 1; struct resource *res = request_region(base, num, "tcic-2");
else if (!res) /* region is busy */
return 0; return 1;
release_region(base, num);
}
return 0;
} }
/*====================================================================== /*======================================================================
......
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