lkml.org 
[lkml]   [2012]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RESEND char-misc-next 05/14] mei: include local headers after the system ones
Date
first include linux/mei.h then only local headers
to avoid possible false dependencies

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/amthif.c | 3 +--
drivers/misc/mei/init.c | 4 ++--
drivers/misc/mei/interface.c | 3 ++-
drivers/misc/mei/interrupt.c | 4 ++--
drivers/misc/mei/iorw.c | 4 ++--
drivers/misc/mei/main.c | 3 ++-
drivers/misc/mei/wd.c | 4 ++--
7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 77acd23..bb613f7 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -31,10 +31,9 @@
#include <linux/jiffies.h>
#include <linux/uaccess.h>

+#include <linux/mei.h>

#include "mei_dev.h"
-#include "hw.h"
-#include <linux/mei.h>
#include "interface.h"

const uuid_le mei_amthi_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, 0xac,
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index c0c0b3e..08884ef 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -19,10 +19,10 @@
#include <linux/wait.h>
#include <linux/delay.h>

+#include <linux/mei.h>
+
#include "mei_dev.h"
-#include "hw.h"
#include "interface.h"
-#include <linux/mei.h>

const char *mei_dev_state_str(int state)
{
diff --git a/drivers/misc/mei/interface.c b/drivers/misc/mei/interface.c
index 17d93f7..810431e 100644
--- a/drivers/misc/mei/interface.c
+++ b/drivers/misc/mei/interface.c
@@ -15,8 +15,9 @@
*/

#include <linux/pci.h>
-#include "mei_dev.h"
#include <linux/mei.h>
+
+#include "mei_dev.h"
#include "interface.h"


diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index fe93d1c..0a020ad 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -21,9 +21,9 @@
#include <linux/fs.h>
#include <linux/jiffies.h>

-#include "mei_dev.h"
#include <linux/mei.h>
-#include "hw.h"
+
+#include "mei_dev.h"
#include "interface.h"


diff --git a/drivers/misc/mei/iorw.c b/drivers/misc/mei/iorw.c
index eb93a1b..7ccc3d8 100644
--- a/drivers/misc/mei/iorw.c
+++ b/drivers/misc/mei/iorw.c
@@ -33,9 +33,9 @@
#include <linux/uaccess.h>


-#include "mei_dev.h"
-#include "hw.h"
#include <linux/mei.h>
+
+#include "mei_dev.h"
#include "interface.h"

/**
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 7751b58..da94260 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -37,8 +37,9 @@
#include <linux/interrupt.h>
#include <linux/miscdevice.h>

-#include "mei_dev.h"
#include <linux/mei.h>
+
+#include "mei_dev.h"
#include "interface.h"

/* AMT device is a singleton on the platform */
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index 9d4d4aa..9c3738a 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -21,10 +21,10 @@
#include <linux/sched.h>
#include <linux/watchdog.h>

+#include <linux/mei.h>
+
#include "mei_dev.h"
-#include "hw.h"
#include "interface.h"
-#include <linux/mei.h>

static const u8 mei_start_wd_params[] = { 0x02, 0x12, 0x13, 0x10 };
static const u8 mei_stop_wd_params[] = { 0x02, 0x02, 0x14, 0x10 };
--
1.7.4.4


\
 
 \ /
  Last update: 2012-12-25 18:21    [W:0.046 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site