Commit 07f6a887 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] check_region elimination

Trivial patch update against 2.5.17:
johnpol@2ka.mipt.ru: Re: 47) request_region check, 41-50:
parent f0e0a6df
...@@ -114,12 +114,6 @@ static int __init pcwd_checkcard(void) ...@@ -114,12 +114,6 @@ static int __init pcwd_checkcard(void)
{ {
int card_dat, prev_card_dat, found = 0, count = 0, done = 0; int card_dat, prev_card_dat, found = 0, count = 0, done = 0;
/* As suggested by Alan Cox - this is a safety measure. */
if (check_region(current_readport, 4)) {
printk("pcwd: Port 0x%x unavailable.\n", current_readport);
return 0;
}
card_dat = 0x00; card_dat = 0x00;
prev_card_dat = 0x00; prev_card_dat = 0x00;
...@@ -628,15 +622,31 @@ static int __init pcwatchdog_init(void) ...@@ -628,15 +622,31 @@ static int __init pcwatchdog_init(void)
outb_p(0xA5, current_readport + 3); outb_p(0xA5, current_readport + 3);
} }
if (revision == PCWD_REVISION_A) if (misc_register(&pcwd_miscdev))
request_region(current_readport, 2, "PCWD Rev.A (Berkshire)"); return -ENODEV;
else
request_region(current_readport, 4, "PCWD Rev.C (Berkshire)"); if (supports_temp)
if (misc_register(&temp_miscdev)) {
misc_deregister(&pcwd_miscdev);
return -ENODEV;
}
misc_register(&pcwd_miscdev);
if (supports_temp) if (revision == PCWD_REVISION_A) {
misc_register(&temp_miscdev); if (!request_region(current_readport, 2, "PCWD Rev.A (Berkshire)")) {
misc_deregister(&pcwd_miscdev);
if (supports_temp)
misc_deregister(&pcwd_miscdev);
return -EIO;
}
}
else
if (!request_region(current_readport, 4, "PCWD Rev.C (Berkshire)")) {
misc_deregister(&pcwd_miscdev);
if (supports_temp)
misc_deregister(&pcwd_miscdev);
return -EIO;
}
return 0; 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