[WATCHDOG] Clean-up includes

Use #include <linux/io.h> instead of <asm/io.h>
Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
Clean-up includes.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 269ada2f1fc373c253683eae4ec41d156d27d525..28d9057c9be66f5c660b9efcda762689cbe18f76 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -65,7 +65,6 @@
 #include <linux/ioport.h>              /* For io-port access */
 #include <linux/platform_device.h>     /* For platform_driver framework */
 #include <linux/init.h>                        /* For __init/__exit/... */
-
 #include <linux/uaccess.h>             /* For copy_to_user/put_user/... */
 #include <linux/io.h>                  /* For inb/outb/... */
 

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 220d238ee4277cdb61f56402c8eac1a6e437d5e9..e6bf8d2d3d309ddd45b7b7289a7fb225e22342d4 100644 (file)
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -37,9 +37,9 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
 
 #define DRV_NAME "advantechwdt"

diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index 88760cb5ec131aa65275db6f3abff46c842b0b08..80e323ddc4baa0a71b9331efcdf3c7d79d5d1516 100644 (file)
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/pci.h>
-
 #include <linux/uaccess.h>
 #include <linux/io.h>
 

diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index c495f36c6aa9bda6764c29e55afee446ad28fd60..726e75d9db7a02f6e4c078d04eeb7b3b94bd3ad6 100644 (file)
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -31,9 +31,9 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/pci.h>
-
 #include <linux/io.h>
 #include <linux/uaccess.h>
+
 #include <asm/system.h>
 
 #define OUR_NAME "alim7101_wdt"

diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 2b92818cc66452806782daa89e05eab228aace17..8f6e871b3fe3b12c90608b00e3a8b024b762aea3 100644 (file)
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -24,8 +24,8 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/blackfin.h>
 #include <linux/uaccess.h>
+#include <asm/blackfin.h>
 
 #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
 #define stampit() stamp("here i am")

diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 30d09cbbad949beeeee573bc0a31724dc38d8619..a41f57ce581ae29e2b69f91fcd1ddd1cfa46a49a 100644 (file)
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -17,8 +17,8 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
+#include <linux/uaccess.h>
 
-#include <asm/uaccess.h>
 #include <asm/geode.h>
 
 #define GEODEWDT_HZ 500

diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c
index 09e9534ac2e4623d8601c66f2e6b1353d0c93fbf..e9e1f7b3fb75bb5ce49c87df9ec17443c4507990 100644 (file)
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>              /* For printk/panic/... */
 #include <linux/init.h>                        /* For __init/__exit/... */
 #include <linux/ioport.h>              /* For io-port access */
-
 #include <linux/io.h>                  /* For inb/outb/... */
 
 #include "iTCO_vendor.h"

diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 805a54b02aa1641a801a17785c9e6c2c19c8457e..9eb9537c370e1aef589d9b371728c26cba436e10 100644 (file)
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -41,9 +41,9 @@
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
-
 #include <linux/io.h>
 #include <linux/uaccess.h>
+
 #include <asm/system.h>
 
 static struct platform_device *ibwdt_platform_device;

diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 24e624c847ae3c0993de5244a37cc03fa8b33f4c..1bafd7b58ca5253ff633ed28a122b6efab067004 100644 (file)
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -22,9 +22,9 @@
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/uaccess.h>
 
 #include <asm/hardware.h>
-#include <asm/uaccess.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 static int heartbeat = 60;     /* (secs) Default is 1 minute */

diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index ac09fe4d95730adea1a3ad2a76555b147d947584..acf589dc057ce4bfc7fc68037bce4da4ce4c12b0 100644 (file)
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
-
 #include <linux/mv643xx.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index ccdf069792d91ab6574dbdfb24252d70aa5d8fb1..5aae071cc045e8d7db7445115ced9c6c71c2e826 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -40,8 +40,7 @@
 #include <linux/moduleparam.h>
 #include <linux/clk.h>
 #include <linux/bitops.h>
-
-#include </io.h>
+#include <linux/io.h>
 #include <linux/uaccess.h>
 #include <linux/hardware.h>
 

diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 61a89e9596421376d2047686f7177e32b073ca41..a1d31d1f750f186d17147aa1a5d5060cbf0a9cfe 100644 (file)
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -46,9 +46,8 @@
 #include <linux/pci.h>         /* For pci functions */
 #include <linux/ioport.h>      /* For io-port access */
 #include <linux/spinlock.h>    /* For spin_lock/spin_unlock/... */
-
-#include <asm/uaccess.h>       /* For copy_to_user/put_user/... */
-#include <asm/io.h>            /* For inb/outb/... */
+#include <linux/uaccess.h>     /* For copy_to_user/put_user/... */
+#include <linux/io.h>          /* For inb/outb/... */
 
 /* Module and version information */
 #define WATCHDOG_VERSION "1.03"

diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index bf443d077a1ea40b9b907b27055f50e7fd56a464..825102a339103dbd3c025ef6d3289577e2df900f 100644 (file)
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -40,8 +40,7 @@
 #include <linux/slab.h>                /* For kmalloc, ... */
 #include <linux/mutex.h>       /* For mutex locking */
 #include <linux/hid.h>         /* For HID_REQ_SET_REPORT & HID_DT_REPORT */
-
-#include <asm/uaccess.h>       /* For copy_to_user/put_user/... */
+#include <linux/uaccess.h>     /* For copy_to_user/put_user/... */
 
 
 #ifdef CONFIG_USB_DEBUG

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 8cd0d53941e787e9bc7137b57e91355c004539ae..56dee3bfd4aa24ecef18c2305001ed62b7579999 100644 (file)
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -28,11 +28,11 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/spinlock.h>
-
-#include <asm/hardware.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
+#include <asm/hardware.h>
+
 #define MODULE_NAME "PNX4008-WDT: "
 
 /* WatchDog Timer - Chapter 23 Page 207 */