Merge tag 'staging-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[karo-tx-linux.git] / drivers / staging / greybus / svc_watchdog.c

diff --git a/drivers/staging/greybus/svc_watchdog.c b/drivers/staging/greybus/svc_watchdog.c
index 12cef5c06e27d39babea12cc4ad5e219e9b4cd65..779fbea5d4ba8ac290a20c9f5d0b81c152c57dc8 100644 (file)
--- a/drivers/staging/greybus/svc_watchdog.c
+++ b/drivers/staging/greybus/svc_watchdog.c
@@ -11,7 +11,7 @@
 #include <linux/workqueue.h>
 #include "greybus.h"
 
-#define SVC_WATCHDOG_PERIOD    (2*HZ)
+#define SVC_WATCHDOG_PERIOD    (2 * HZ)
 
 struct gb_svc_watchdog {
        struct delayed_work     work;
@@ -56,7 +56,7 @@ static void greybus_reset(struct work_struct *work)
                NULL,
        };
 
-       printk(KERN_ERR "svc_watchdog: calling \"%s %s\" to reset greybus network!\n",
+       pr_err("svc_watchdog: calling \"%s %s\" to reset greybus network!\n",
               argv[0], argv[1]);
        call_usermodehelper(start_path, argv, envp, UMH_WAIT_EXEC);
 }