Merge tag 'platform-drivers-x86-v5.4-2' of git://git.infradead.org/linux-platform...

[linux.git] / drivers / watchdog / ie6xx_wdt.c

diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index 508fbefce9f6a748ef6ed1a3795e049ea3e2a458..8f28993fab8b56aa11effc154f3fc9d198710e7a 100644 (file)
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -66,7 +66,7 @@ MODULE_PARM_DESC(resetmode,
 
 static struct {
        unsigned short sch_wdtba;
-       struct spinlock unlock_sequence;
+       spinlock_t unlock_sequence;
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs;
 #endif
@@ -254,12 +254,8 @@ static int ie6xx_wdt_probe(struct platform_device *pdev)
        ie6xx_wdt_debugfs_init();
 
        ret = watchdog_register_device(&ie6xx_wdt_dev);
-       if (ret) {
-               dev_err(&pdev->dev,
-                       "Watchdog timer: cannot register device (err =%d)\n",
-                                                                       ret);
+       if (ret)
                goto misc_register_error;
-       }
 
        return 0;