ramips: rt305x: enable M25P80 driver

[openwrt.git] / target / linux / adm5120 / files / drivers / watchdog / adm5120_wdt.c

diff --git a/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c b/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c
index cddb172..bf90568 100644 (file)
--- a/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c
+++ b/target/linux/adm5120/files/drivers/watchdog/adm5120_wdt.c
@@ -12,20 +12,18 @@
  *     2 of the License, or (at your option) any later version.
  *
  */
  *     2 of the License, or (at your option) any later version.
  *
  */

-

 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>

+#include <linux/irq.h>

 
 #include <asm/bootinfo.h>
 
 
 #include <asm/bootinfo.h>
 

-#include <adm5120_info.h>
-#include <adm5120_defs.h>
-#include <adm5120_irq.h>
-#include <adm5120_switch.h>
-
+#include <asm/mach-adm5120/adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_switch.h>

 
 #define DEFAULT_TIMEOUT        15              /* (secs) Default is 15 seconds */
 #define MAX_TIMEOUT    327
 
 #define DEFAULT_TIMEOUT        15              /* (secs) Default is 15 seconds */
 #define MAX_TIMEOUT    327


@@ -34,8 +32,8 @@
 #define NAME "adm5120_wdt"
 #define VERSION "0.1"
 
 #define NAME "adm5120_wdt"
 #define VERSION "0.1"
 

-static int expect_close = 0;
-static int access = 0;
+static int expect_close;
+static int access;

 static unsigned int timeout = DEFAULT_TIMEOUT;
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned int timeout = DEFAULT_TIMEOUT;
 
 static int nowayout = WATCHDOG_NOWAYOUT;


@@ -73,9 +71,8 @@ static int wdt_open(struct inode *inode, struct file *file)
        if (access)
                return -EBUSY;
 
        if (access)
                return -EBUSY;
 

-       if (nowayout) {
+       if (nowayout)

                __module_get(THIS_MODULE);
                __module_get(THIS_MODULE);

-       }

 
        /* Activate timer */
        wdt_reset_counter();
 
        /* Activate timer */
        wdt_reset_counter();


@@ -88,16 +85,16 @@ static int wdt_open(struct inode *inode, struct file *file)
 static int wdt_release(struct inode *inode, struct file *file)
 {
        /*
 static int wdt_release(struct inode *inode, struct file *file)
 {
        /*

-        *      Shut off the timer.
-        *      Lock it in if it's a module and we set nowayout
+        * Shut off the timer.
+        * Lock it in if it's a module and we set nowayout

         */
        if (expect_close && (nowayout == 0)) {
                wdt_disable();
                printk(KERN_INFO NAME ": disabling watchdog timer\n");
                module_put(THIS_MODULE);
         */
        if (expect_close && (nowayout == 0)) {
                wdt_disable();
                printk(KERN_INFO NAME ": disabling watchdog timer\n");
                module_put(THIS_MODULE);

-       } else {
+       } else

                printk(KERN_CRIT NAME ": device closed unexpectedly.  WDT will not stop!\n");
                printk(KERN_CRIT NAME ": device closed unexpectedly.  WDT will not stop!\n");

-       }
+

        access = 0;
        return 0;
 }
        access = 0;
        return 0;
 }


@@ -138,46 +135,46 @@ static int wdt_ioctl(struct inode *inode, struct file *file,
                .identity =             "ADM5120_WDT Watchdog",
        };
        switch (cmd) {
                .identity =             "ADM5120_WDT Watchdog",
        };
        switch (cmd) {

-               default:
-                       return -ENOTTY;
-               case WDIOC_GETSUPPORT:
-                       if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
-                               return -EFAULT;
-                       return 0;
-               case WDIOC_GETSTATUS:
-               case WDIOC_GETBOOTSTATUS:
-                       return put_user(0,(int *)arg);
-               case WDIOC_KEEPALIVE:
-                       wdt_reset_counter();
-                       return 0;
-               case WDIOC_SETTIMEOUT:
-                       if (get_user(new_timeout, (int *)arg))
-                               return -EFAULT;
-                       if (new_timeout < 1)
-                               return -EINVAL;
-                       if (new_timeout > MAX_TIMEOUT)
-                               return -EINVAL;
-                       timeout = new_timeout;
-                       wdt_set_timeout();
-                       /* Fall */
-               case WDIOC_GETTIMEOUT:
-                       return put_user(timeout, (int *)arg);
+       default:
+               return -ENOTTY;
+       case WDIOC_GETSUPPORT:
+               if (copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
+                       return -EFAULT;
+               return 0;
+       case WDIOC_GETSTATUS:
+       case WDIOC_GETBOOTSTATUS:
+               return put_user(0, (int *)arg);
+       case WDIOC_KEEPALIVE:
+               wdt_reset_counter();
+               return 0;
+       case WDIOC_SETTIMEOUT:
+               if (get_user(new_timeout, (int *)arg))
+                       return -EFAULT;
+               if (new_timeout < 1)
+                       return -EINVAL;
+               if (new_timeout > MAX_TIMEOUT)
+                       return -EINVAL;
+               timeout = new_timeout;
+               wdt_set_timeout();
+               /* Fall */
+       case WDIOC_GETTIMEOUT:
+               return put_user(timeout, (int *)arg);

        }
 }
 
        }
 }
 

-static struct file_operations wdt_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       write:          wdt_write,
-       ioctl:          wdt_ioctl,
-       open:           wdt_open,
-       release:        wdt_release,
+static const struct file_operations wdt_fops = {
+       .owner          = THIS_MODULE,
+       .llseek         = no_llseek,
+       .write          = wdt_write,
+       .ioctl          = wdt_ioctl,
+       .open           = wdt_open,
+       .release        = wdt_release,

 };
 
 static struct miscdevice wdt_miscdev = {
 };
 
 static struct miscdevice wdt_miscdev = {

-       minor:          WATCHDOG_MINOR,
-       name:           "watchdog",
-       fops:           &wdt_fops,
+       .minor          = WATCHDOG_MINOR,
+       .name           = "watchdog",
+       .fops           = &wdt_fops,

 };
 
 static char banner[] __initdata = KERN_INFO NAME ": Watchdog Timer version " VERSION "\n";
 };
 
 static char banner[] __initdata = KERN_INFO NAME ": Watchdog Timer version " VERSION "\n";