Browse Source

mtd: nand: denali: consolidate include directives

Include necessary headers explicitly without relying on indirect
header inclusion.  Also, sort them alphabetically.

<linux/delay.h>, <linux/wait.h>, <linux/mutex.h> turned out bogus,
so removed.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Masahiro Yamada 8 years ago
parent
commit
da4734be23

+ 7 - 5
drivers/mtd/nand/denali.c

@@ -16,14 +16,16 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  *
  *
  */
  */
-#include <linux/interrupt.h>
-#include <linux/delay.h>
+
+#include <linux/completion.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-mapping.h>
-#include <linux/wait.h>
-#include <linux/mutex.h>
-#include <linux/mtd/mtd.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/module.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
 
 
 #include "denali.h"
 #include "denali.h"
 
 

+ 3 - 0
drivers/mtd/nand/denali.h

@@ -21,7 +21,10 @@
 #define __DENALI_H__
 #define __DENALI_H__
 
 
 #include <linux/bitops.h>
 #include <linux/bitops.h>
+#include <linux/completion.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/rawnand.h>
+#include <linux/spinlock_types.h>
+#include <linux/types.h>
 
 
 #define DEVICE_RESET				0x0
 #define DEVICE_RESET				0x0
 #define     DEVICE_RESET__BANK(bank)			BIT(bank)
 #define     DEVICE_RESET__BANK(bank)			BIT(bank)

+ 2 - 1
drivers/mtd/nand/denali_dt.c

@@ -12,15 +12,16 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  * more details.
  */
  */
+
 #include <linux/clk.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_device.h>
+#include <linux/platform_device.h>
 
 
 #include "denali.h"
 #include "denali.h"
 
 

+ 3 - 0
drivers/mtd/nand/denali_pci.c

@@ -11,6 +11,9 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  * more details.
  */
  */
+
+#include <linux/errno.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pci.h>