[WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
Also, use the WATCHDOG_NOWAYOUT macro, rather than #ifdefs, and use __module_get to prevent module unloading if WATCHDOG_NOWAYOUT is set. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
parent
85d57238d2
commit
d37a5c3ddf
|
@ -45,6 +45,10 @@ static void __iomem *mv64x60_wdt_regs;
|
||||||
static int mv64x60_wdt_timeout;
|
static int mv64x60_wdt_timeout;
|
||||||
static unsigned int bus_clk;
|
static unsigned int bus_clk;
|
||||||
|
|
||||||
|
static int nowayout = WATCHDOG_NOWAYOUT;
|
||||||
|
module_param(nowayout, int, 0);
|
||||||
|
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
|
||||||
|
|
||||||
static void mv64x60_wdt_reg_write(u32 val)
|
static void mv64x60_wdt_reg_write(u32 val)
|
||||||
{
|
{
|
||||||
/* Allow write only to CTL1 / CTL2 fields, retaining values in
|
/* Allow write only to CTL1 / CTL2 fields, retaining values in
|
||||||
|
@ -100,6 +104,9 @@ static int mv64x60_wdt_open(struct inode *inode, struct file *file)
|
||||||
if (test_and_set_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags))
|
if (test_and_set_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags))
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
|
||||||
|
if (nowayout)
|
||||||
|
__module_get(THIS_MODULE);
|
||||||
|
|
||||||
mv64x60_wdt_service();
|
mv64x60_wdt_service();
|
||||||
mv64x60_wdt_handler_enable();
|
mv64x60_wdt_handler_enable();
|
||||||
|
|
||||||
|
@ -110,9 +117,8 @@ static int mv64x60_wdt_release(struct inode *inode, struct file *file)
|
||||||
{
|
{
|
||||||
mv64x60_wdt_service();
|
mv64x60_wdt_service();
|
||||||
|
|
||||||
#if !defined(CONFIG_WATCHDOG_NOWAYOUT)
|
if (!nowayout)
|
||||||
mv64x60_wdt_handler_disable();
|
mv64x60_wdt_handler_disable();
|
||||||
#endif
|
|
||||||
|
|
||||||
clear_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags);
|
clear_bit(MV64x60_WDOG_FLAG_OPENED, &wdt_flags);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue