From 190241a362480e193e7b5f7a9fd9ff492c4acb31 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@linaro.org>
Date: Tue, 9 Jun 2015 17:42:49 -0500
Subject: [PATCH] greybus: drop some unnecessary headers

There's no need to include anything other than "greybus.h" in
"connection.c".  Same thing in "core.c" and "manifest.c" and
"svc.c".  Some files need headers included, but most come along
with "greybus.h".

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 drivers/staging/greybus/connection.c | 3 ---
 drivers/staging/greybus/core.c       | 7 -------
 drivers/staging/greybus/es1.c        | 5 -----
 drivers/staging/greybus/es2.c        | 5 -----
 drivers/staging/greybus/manifest.c   | 2 --
 drivers/staging/greybus/svc.c        | 5 -----
 6 files changed, 27 deletions(-)

diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index 5ab744b14a0d..8f528c1640e1 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -7,9 +7,6 @@
  * Released under the GPLv2 only.
  */
 
-#include <linux/atomic.h>
-
-#include "kernel_ver.h"
 #include "greybus.h"
 
 static DEFINE_SPINLOCK(gb_connections_lock);
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index a4d7057a061c..e7a280cfbe81 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -9,13 +9,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/device.h>
-
 #include "greybus.h"
 
 /* Allow greybus to be disabled at boot if needed */
diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index 45241c37f1d4..56c80c6ddb3a 100644
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -6,16 +6,11 @@
  *
  * Released under the GPLv2 only.
  */
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/kthread.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/usb.h>
 #include <linux/kfifo.h>
 #include <linux/debugfs.h>
-#include <linux/uaccess.h>
 #include <asm/unaligned.h>
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index b5b395f5c968..5257779f7aed 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -6,16 +6,11 @@
  *
  * Released under the GPLv2 only.
  */
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/kthread.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
 #include <linux/sizes.h>
 #include <linux/usb.h>
 #include <linux/kfifo.h>
 #include <linux/debugfs.h>
-#include <linux/uaccess.h>
 #include <asm/unaligned.h>
 
 #include "greybus.h"
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index 2022183a6e44..f4fe4f37cda6 100644
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -9,8 +9,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/err.h>
-
 #include "greybus.h"
 
 static const char *get_descriptor_type_string(u8 type)
diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index f02283810231..ba85e81964c4 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -7,12 +7,7 @@
  * Released under the GPLv2 only.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-
 #include "greybus.h"
-#include "greybus_protocols.h"
 
 struct gb_svc {
 	struct gb_connection	*connection;
-- 
2.11.0