← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/watchdog/booke_wdt.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/watchdog/booke_wdt.c
4
4
 * Author: Matthew McClintock
5
5
 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
6
6
 *
7
 
 * Copyright 2005, 2008, 2010 Freescale Semiconductor Inc.
 
7
 * Copyright 2005, 2008, 2010-2011 Freescale Semiconductor Inc.
8
8
 *
9
9
 * This program is free software; you can redistribute  it and/or modify it
10
10
 * under  the terms of  the GNU General  Public License as published by the
221
221
        if (booke_wdt_enabled == 0) {
222
222
                booke_wdt_enabled = 1;
223
223
                on_each_cpu(__booke_wdt_enable, NULL, 0);
224
 
                printk(KERN_INFO
225
 
                      "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
226
 
                                booke_wdt_period);
 
224
                pr_debug("booke_wdt: watchdog enabled (timeout = %llu sec)\n",
 
225
                        period_to_sec(booke_wdt_period));
227
226
        }
228
227
        spin_unlock(&booke_wdt_lock);
229
228
 
240
239
         */
241
240
        on_each_cpu(__booke_wdt_disable, NULL, 0);
242
241
        booke_wdt_enabled = 0;
 
242
        pr_debug("booke_wdt: watchdog disabled\n");
243
243
#endif
244
244
 
245
245
        clear_bit(0, &wdt_is_active);
271
271
{
272
272
        int ret = 0;
273
273
 
274
 
        printk(KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
 
274
        pr_info("booke_wdt: powerpc book-e watchdog driver loaded\n");
275
275
        ident.firmware_version = cur_cpu_spec->pvr_value;
276
276
 
277
277
        ret = misc_register(&booke_wdt_miscdev);
278
278
        if (ret) {
279
 
                printk(KERN_CRIT "Cannot register miscdev on minor=%d: %d\n",
280
 
                                WATCHDOG_MINOR, ret);
 
279
                pr_err("booke_wdt: cannot register device (minor=%u, ret=%i)\n",
 
280
                       WATCHDOG_MINOR, ret);
281
281
                return ret;
282
282
        }
283
283
 
284
284
        spin_lock(&booke_wdt_lock);
285
285
        if (booke_wdt_enabled == 1) {
286
 
                printk(KERN_INFO
287
 
                      "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
288
 
                                booke_wdt_period);
 
286
                pr_info("booke_wdt: watchdog enabled (timeout = %llu sec)\n",
 
287
                        period_to_sec(booke_wdt_period));
289
288
                on_each_cpu(__booke_wdt_enable, NULL, 0);
290
289
        }
291
290
        spin_unlock(&booke_wdt_lock);