Skip to contentSkip to conversation

watchdog: Drop unnecessary include of miscdevice.h

PATCH In review Guenter Roeck 2 participants 2 messages Nov 19, 2013 – Nov 20, 2013

Subsystems (6)
lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

PATCH 1/1 watchdog: Drop unnecessary include of miscdevice.h

After commit 487722cf2 (watchdog: Get rid of MODULE_ALIAS_MISCDEV statements) the affected drivers no longer need to include miscdevice.h. Only exception is rt2880_wdt.c which never needed it.

---
Compile tested.

 drivers/watchdog/bcm2835_wdt.c      |    1 -
 drivers/watchdog/ep93xx_wdt.c       |    1 -
 drivers/watchdog/ie6xx_wdt.c        |    1 -
 drivers/watchdog/jz4740_wdt.c       |    1 -
 drivers/watchdog/kempld_wdt.c       |    1 -
 drivers/watchdog/max63xx_wdt.c      |    1 -
 drivers/watchdog/orion_wdt.c        |    1 -
 drivers/watchdog/pnx4008_wdt.c      |    1 -
 drivers/watchdog/rt2880_wdt.c       |    1 -
 drivers/watchdog/shwdt.c            |    1 -
 drivers/watchdog/softdog.c          |    1 -
 drivers/watchdog/stmp3xxx_rtc_wdt.c |    1 -
 drivers/watchdog/txx9wdt.c          |    1 -
 drivers/watchdog/ux500_wdt.c        |    1 -
 14 files changed, 14 deletions(-)
drivers/watchdog/bcm2835_wdt.c +0 -1
index a6a2ceb..cafa973 100644
@@ -19,7 +19,6 @@
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
 #include <linux/of_address.h>
-#include <linux/miscdevice.h>
 
 #define PM_RSTC				0x1c
 #define PM_WDOG				0x24
drivers/watchdog/ep93xx_wdt.c +0 -1
index 833e813..d1d07f2 100644
@@ -28,7 +28,6 @@
 
 #include <linux/platform_device.h>
 #include <linux/module.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/timer.h>
 #include <linux/io.h>
drivers/watchdog/ie6xx_wdt.c +0 -1
index 70a2402..07f88f5 100644
@@ -28,7 +28,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
-#include <linux/miscdevice.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
drivers/watchdog/jz4740_wdt.c +0 -1
index 2de486a..3aa50cf 100644
@@ -17,7 +17,6 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
drivers/watchdog/kempld_wdt.c +0 -1
index a1a3638..20dc738 100644
@@ -26,7 +26,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/miscdevice.h>
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
drivers/watchdog/max63xx_wdt.c +0 -1
index 6d4f399..bdb3f4a 100644
@@ -19,7 +19,6 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
drivers/watchdog/orion_wdt.c +0 -1
index 44edca6..f7722a4 100644
@@ -16,7 +16,6 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
drivers/watchdog/pnx4008_wdt.c +0 -1
index 1bdcc31..5bec20f 100644
@@ -23,7 +23,6 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
drivers/watchdog/rt2880_wdt.c +0 -1
index 53d37fe..d92c2d5 100644
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/watchdog.h>
-#include <linux/miscdevice.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 
drivers/watchdog/shwdt.c +0 -1
index f9b8e06..af3528f 100644
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/pm_runtime.h>
 #include <linux/fs.h>
drivers/watchdog/softdog.c +0 -1
index ef2638f..c04a1aa 100644
@@ -42,7 +42,6 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/timer.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
drivers/watchdog/stmp3xxx_rtc_wdt.c +0 -1
index d667f6b..bb64ae3 100644
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
 #include <linux/stmp3xxx_rtc_wdt.h>
drivers/watchdog/txx9wdt.c +0 -1
index 0fd0e8a..6a447e3 100644
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
drivers/watchdog/ux500_wdt.c +0 -1
index e029b57..5aed9d7 100644
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/moduleparam.h>
-#include <linux/miscdevice.h>
 #include <linux/err.h>
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
Signature · 1 line
1.7.9.7
Reviewed-by on v1 1/1
#1 lore raw

Hi Guenter,

Quoted 3 lines · Guenter Roeck

After commit 487722cf2 (watchdog: Get rid of MODULE_ALIAS_MISCDEV statements) the affected drivers no longer need to include miscdevice.h. Only exception is rt2880_wdt.c which never needed it.

I'm surprised because I thought I did check after applying my changes and had removed the #include <linux/miscdevice.h> every time it was OK to do so. But apparently I missed many... Thanks for noticing.

Quoted 20 lines

---
Compile tested.

 drivers/watchdog/bcm2835_wdt.c      |    1 -
 drivers/watchdog/ep93xx_wdt.c       |    1 -
 drivers/watchdog/ie6xx_wdt.c        |    1 -
 drivers/watchdog/jz4740_wdt.c       |    1 -
 drivers/watchdog/kempld_wdt.c       |    1 -
 drivers/watchdog/max63xx_wdt.c      |    1 -
 drivers/watchdog/orion_wdt.c        |    1 -
 drivers/watchdog/pnx4008_wdt.c      |    1 -
 drivers/watchdog/rt2880_wdt.c       |    1 -
 drivers/watchdog/shwdt.c            |    1 -
 drivers/watchdog/softdog.c          |    1 -
 drivers/watchdog/stmp3xxx_rtc_wdt.c |    1 -
 drivers/watchdog/txx9wdt.c          |    1 -
 drivers/watchdog/ux500_wdt.c        |    1 -
 14 files changed, 14 deletions(-)

(...)

Signature · 2 lines
Jean Delvare
Suse L3 Support