diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
tree | a03891a32abe0da191fb765fe669a597e07423c6 /drivers/watchdog/s3c2410_wdt.c | |
parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/watchdog/s3c2410_wdt.c')
-rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 22715e3be5e7..86d42801de45 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
@@ -21,18 +21,6 @@ | |||
21 | * You should have received a copy of the GNU General Public License | 21 | * You should have received a copy of the GNU General Public License |
22 | * along with this program; if not, write to the Free Software | 22 | * along with this program; if not, write to the Free Software |
23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
24 | * | ||
25 | * Changelog: | ||
26 | * 05-Oct-2004 BJD Added semaphore init to stop crashes on open | ||
27 | * Fixed tmr_count / wdt_count confusion | ||
28 | * Added configurable debug | ||
29 | * | ||
30 | * 11-Jan-2005 BJD Fixed divide-by-2 in timeout code | ||
31 | * | ||
32 | * 25-Jan-2005 DA Added suspend/resume support | ||
33 | * Replaced reboot notifier with .shutdown method | ||
34 | * | ||
35 | * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA | ||
36 | */ | 24 | */ |
37 | 25 | ||
38 | #include <linux/module.h> | 26 | #include <linux/module.h> |
@@ -365,7 +353,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) | |||
365 | return -ENOENT; | 353 | return -ENOENT; |
366 | } | 354 | } |
367 | 355 | ||
368 | size = (res->end-res->start)+1; | 356 | size = (res->end - res->start) + 1; |
369 | wdt_mem = request_mem_region(res->start, size, pdev->name); | 357 | wdt_mem = request_mem_region(res->start, size, pdev->name); |
370 | if (wdt_mem == NULL) { | 358 | if (wdt_mem == NULL) { |
371 | dev_err(dev, "failed to get memory region\n"); | 359 | dev_err(dev, "failed to get memory region\n"); |
@@ -374,7 +362,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) | |||
374 | } | 362 | } |
375 | 363 | ||
376 | wdt_base = ioremap(res->start, size); | 364 | wdt_base = ioremap(res->start, size); |
377 | if (wdt_base == 0) { | 365 | if (wdt_base == NULL) { |
378 | dev_err(dev, "failed to ioremap() region\n"); | 366 | dev_err(dev, "failed to ioremap() region\n"); |
379 | ret = -EINVAL; | 367 | ret = -EINVAL; |
380 | goto err_req; | 368 | goto err_req; |