[RESEND char-misc-next 14/18] mei: remove include to pci header from mei module files

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

From: Tomas Winkler <tomas.winkler@intel.com>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, linux-kernel@vger.kernel.org,
	Tomas Winkler <tomas.winkler@intel.com>
Subject: [RESEND char-misc-next 14/18] mei: remove include to pci header from mei module files
Date: Mon, 29 Sep 2014 16:31:46 +0300	[thread overview]
Message-ID: <1411997510-29094-15-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1411997510-29094-1-git-send-email-tomas.winkler@intel.com>

Remove inclusion of linux/pci.h in mei layer
however we need to include the headers that before
got included implicitly from linux/pci.h.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/amthif.c    | 2 +-
 drivers/misc/mei/bus.c       | 1 -
 drivers/misc/mei/client.c    | 2 +-
 drivers/misc/mei/debugfs.c   | 1 -
 drivers/misc/mei/hbm.c       | 5 +++--
 drivers/misc/mei/init.c      | 1 -
 drivers/misc/mei/interrupt.c | 2 +-
 drivers/misc/mei/main.c      | 2 +-
 drivers/misc/mei/nfc.c       | 3 ++-
 drivers/misc/mei/wd.c        | 1 -
 include/linux/mei_cl_bus.h   | 1 +
 11 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 5d47d1b..d9b0e761f 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -20,7 +20,6 @@
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/aio.h>
-#include <linux/pci.h>
 #include <linux/ioctl.h>
 #include <linux/cdev.h>
 #include <linux/list.h>
@@ -29,6 +28,7 @@
 #include <linux/uuid.h>
 #include <linux/jiffies.h>
 #include <linux/uaccess.h>
+#include <linux/slab.h>
 
 #include <linux/mei.h>
 
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 4cc1a66..4d20d60 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/mei_cl_bus.h>
 
 #include "mei_dev.h"
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index bfc3ad2..04a1964 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -14,10 +14,10 @@
  *
  */
 
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/pm_runtime.h>
 
 #include <linux/mei.h>
diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c
index e14a7db..aca7847 100644
--- a/drivers/misc/mei/debugfs.c
+++ b/drivers/misc/mei/debugfs.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/debugfs.h>
-#include <linux/pci.h>
 
 #include <linux/mei.h>
 
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 209650b..c874fdd 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -15,11 +15,12 @@
  */
 
 #include <linux/export.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
-#include <linux/mei.h>
 #include <linux/pm_runtime.h>
+#include <linux/slab.h>
+
+#include <linux/mei.h>
 
 #include "mei_dev.h"
 #include "hbm.h"
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index dd233fd..76ef8ff 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/export.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 8dac769..8844e17 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -16,11 +16,11 @@
 
 
 #include <linux/export.h>
-#include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/jiffies.h>
+#include <linux/slab.h>
 
 #include <linux/mei.h>
 
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 4d738c8..d31f271 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -17,12 +17,12 @@
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
 #include <linux/aio.h>
-#include <linux/pci.h>
 #include <linux/poll.h>
 #include <linux/init.h>
 #include <linux/ioctl.h>
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c
index 9f32fd6..5b369f4 100644
--- a/drivers/misc/mei/nfc.c
+++ b/drivers/misc/mei/nfc.c
@@ -19,7 +19,8 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
-#include <linux/pci.h>
+#include <linux/slab.h>
+
 #include <linux/mei_cl_bus.h>
 
 #include "mei_dev.h"
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index d28511b..626b4c1 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
-#include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/watchdog.h>
 
diff --git a/include/linux/mei_cl_bus.h b/include/linux/mei_cl_bus.h
index d14af7b..164aad1 100644
--- a/include/linux/mei_cl_bus.h
+++ b/include/linux/mei_cl_bus.h
@@ -3,6 +3,7 @@
 
 #include <linux/device.h>
 #include <linux/uuid.h>
+#include <linux/mod_devicetable.h>
 
 struct mei_cl_device;
 
-- 
1.9.3

next prev parent reply	other threads:[~2014-09-29 13:33 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-29 13:31 [RESEND char-misc-next 00/18] mei: resend of rebased patches Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 01/18] mei: add hbm and pg state in devstate debugfs print Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 02/18] mei: debugfs: adjust print buffer Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 03/18] mei: debugfs: add single buffer indicator Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 04/18] mei: pg: fix cat and paste error in comments Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 05/18] mei: fix style warning: Missing a blank line after declarations Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 06/18] mei: nfc: fix style warning Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 07/18] mei: kill error message for allocation failure Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 08/18] mei: move mei_hbm_hdr function from hbm.h the hbm.c Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 09/18] mei: push all standard settings into mei_device_init Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 10/18] mei: get rid of most of the pci dependencies in mei Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 11/18] mei: move fw_status back to hw ops handlers Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 12/18] mei: remove the reference to pdev from mei_device Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 13/18] mei: push pci cfg structure me hw Tomas Winkler
2014-09-29 13:31 ` Tomas Winkler [this message]
2014-09-29 13:31 ` [RESEND char-misc-next 15/18] mei: trivial: fix errors in prints in comments Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 16/18] mei: drop me_client_presentation_num Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 17/18] mei: fix KDoc documentation formatting Tomas Winkler
2014-09-29 13:31 ` [RESEND char-misc-next 18/18] mei: fix kernel-doc warnings Tomas Winkler
2014-09-29 15:56 ` [RESEND char-misc-next 00/18] mei: resend of rebased patches Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411997510-29094-15-git-send-email-tomas.winkler@intel.com \
    --to=tomas.winkler@intel.com \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®