atheros: various printk(...) fixes

[openwrt/svn-archive/archive.git] / target / linux / atheros / patches-3.10 / 130-watchdog.patch

diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.10/130-watchdog.patch
index 8c61c91a0a48e4cedbdbebd6830c197d3e9bf855..7cc8fee9cb5afaa4a042bdce8b8d203970dfb58b 100644 (file)
--- a/target/linux/atheros/patches-3.10/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.10/130-watchdog.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/drivers/watchdog/ar2315-wtd.c
-@@ -0,0 +1,199 @@
+@@ -0,0 +1,200 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -44,8 +44,8 @@
 +#define HEARTBEAT(x) (x < 1 || x > 90 ? 20 : x)
 +
 +static int wdt_timeout = 20;
-+static int started = 0;
-+static int in_use = 0;
++static int started;
++static int in_use;
 +
 +static void
 +ar2315_wdt_enable(void)
@@ -80,11 +80,12 @@
 +}
 +
 +static irqreturn_t
-+ar2315_wdt_interrupt(int irq, void *dev_id)
++ar2315_wdt_interrupt(int irq, void *dev)
 +{
-+      if(started)
-+      {
-+              printk(KERN_CRIT "watchdog expired, rebooting system\n");
++      struct platform_device *pdev = (struct platform_device *)dev;
++
++      if (started) {
++              dev_crit(&pdev->dev, "watchdog expired, rebooting system\n");
 +              emergency_restart();
 +      } else {
 +              ar231x_write_reg(AR2315_WDC, 0);
@@ -105,8 +106,7 @@
 +      int new_wdt_timeout;
 +      int ret = -ENOIOCTLCMD;
 +
-+      switch(cmd)
-+      {
++      switch (cmd) {
 +              case WDIOC_GETSUPPORT:
 +                      ret = copy_to_user((struct watchdog_info __user *)arg, &ident, sizeof(ident)) ? -EFAULT : 0;
 +                      break;
@@ -117,7 +117,8 @@
 +                      break;
 +
 +              case WDIOC_SETTIMEOUT:
-+                      if((ret = get_user(new_wdt_timeout, (int __user *)arg)))
++                      ret = get_user(new_wdt_timeout, (int __user *)arg);
++                      if (ret)
 +                              break;
 +                      wdt_timeout = HEARTBEAT(new_wdt_timeout);
 +                      ar2315_wdt_enable();
@@ -151,16 +152,16 @@
 +      int ret = 0;
 +
 +      ar2315_wdt_enable();
-+      ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt, IRQF_DISABLED, "ar2315_wdt", NULL);
-+      if(ret)
-+      {
-+              printk(KERN_ERR "ar2315wdt: failed to register inetrrupt\n");
++      ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt,
++                        IRQF_DISABLED, "ar2315_wdt", dev);
++      if (ret) {
++              dev_err(&dev->dev, "failed to register inetrrupt\n");
 +              goto out;
 +      }
 +
 +      ret = misc_register(&ar2315_wdt_miscdev);
 +      if(ret)
-+              printk(KERN_ERR "ar2315wdt: failed to register miscdev\n");
++              dev_err(&dev->dev, "failed to register miscdev\n");
 +
 +out:
 +      return ret;
@@ -188,7 +189,7 @@
 +{
 +      int ret = platform_driver_register(&ar2315_wdt_driver);
 +      if(ret)
-+              printk(KERN_INFO "ar2315_wdt: error registering platfom driver!");
++              pr_err("ar2315_wdt: error registering platfom driver!\n");
 +      return ret;
 +}
 +