luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] pcmcia: use request_region in i82365

Browse Source 
randy_dunlap <rdunlap@xenotime.net>

Convert deprecated check_region() calls to request/release region.
Add return value check on one request_region().

I suspect that it may do an extra release_region(), which should
generate a warning message from the kernel.

Signed-off-by: randy_dunlap <rdunlap@xenotime.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dominik Brodowski 2005-06-27 16:28:55 -07:00 committed by Linus Torvalds
parent 378a33a686
commit f354942cb3
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/pcmcia/i82365.c
View File

@ -669,11 +669,13 @@ static int __init is_alive(u_short sock)
if ((stat & I365_CS_DETECT) && (stat & I365_CS_POWERON) &&
(i365_get(sock, I365_INTCTL) & I365_PC_IOCARD) &&
(i365_get(sock, I365_ADDRWIN) & I365_ENA_IO(0)) &&
(check_region(start, stop-start+1) != 0) &&
((start & 0xfeef) != 0x02e8))
return 1;
else
return 0;
((start & 0xfeef) != 0x02e8)) {
if (!request_region(start, stop-start+1, "i82365"))
return 1;
release_region(start, stop-start+1);
}
return 0;
}
/*====================================================================*/
@ -696,7 +698,13 @@ static void __init add_pcic(int ns, int type)
struct i82365_socket *t = &socket[sockets-ns];
base = sockets-ns;
if (t->ioaddr > 0) request_region(t->ioaddr, 2, "i82365");
if (t->ioaddr > 0) {
if (!request_region(t->ioaddr, 2, "i82365")) {
printk(KERN_ERR "i82365: IO region conflict at %#lx, not available\n",
t->ioaddr);
return;
}
}
if (base == 0) printk("\n");
printk(KERN_INFO " %s", pcic[type].name);
@ -803,7 +811,7 @@ static void __init isa_probe(void)
}
#endif
if (check_region(i365_base, 2) != 0) {
if (!request_region(i365_base, 2, "i82365")) {
if (sockets == 0)
printk("port conflict at %#lx\n", i365_base);
return;
@ -1441,6 +1449,7 @@ static void __exit exit_i82365(void)
i365_set(i, I365_CSCINT, 0);
release_region(socket[i].ioaddr, 2);
}
release_region(i365_base, 2);
#ifdef CONFIG_PNP
if (i82365_pnpdev)
pnp_disable_dev(i82365_pnpdev);