浏览代码

platform/chrome: Move mfd/cros_ec_lpc* includes to drivers/platform.

The cros-ec-lpc driver lives in drivers/platform because is platform
specific, however there are two includes (cros_ec_lpc_mec.h and
cros_ec_lpc_reg.h) that lives in include/linux/mfd. These two includes
are only used for the platform driver and are not really related to the
MFD subsystem, so move the includes from include/linux/mfd to
drivers/platform/chrome.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
Enric Balletbo i Serra 7 年之前
父节点
当前提交
cc8a4ea182

+ 2 - 1
drivers/platform/chrome/cros_ec_lpc.c

@@ -27,12 +27,13 @@
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/mfd/cros_ec.h>
 #include <linux/mfd/cros_ec.h>
 #include <linux/mfd/cros_ec_commands.h>
 #include <linux/mfd/cros_ec_commands.h>
-#include <linux/mfd/cros_ec_lpc_reg.h>
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 #include <linux/printk.h>
 #include <linux/printk.h>
 #include <linux/suspend.h>
 #include <linux/suspend.h>
 
 
+#include "cros_ec_lpc_reg.h"
+
 #define DRV_NAME "cros_ec_lpcs"
 #define DRV_NAME "cros_ec_lpcs"
 #define ACPI_DRV_NAME "GOOG0004"
 #define ACPI_DRV_NAME "GOOG0004"
 
 

+ 2 - 1
drivers/platform/chrome/cros_ec_lpc_mec.c

@@ -24,10 +24,11 @@
 #include <linux/delay.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/mfd/cros_ec_commands.h>
 #include <linux/mfd/cros_ec_commands.h>
-#include <linux/mfd/cros_ec_lpc_mec.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
 #include <linux/types.h>
 #include <linux/types.h>
 
 
+#include "cros_ec_lpc_mec.h"
+
 /*
 /*
  * This mutex must be held while accessing the EMI unit. We can't rely on the
  * This mutex must be held while accessing the EMI unit. We can't rely on the
  * EC mutex because memmap data may be accessed without it being held.
  * EC mutex because memmap data may be accessed without it being held.

+ 3 - 3
include/linux/mfd/cros_ec_lpc_mec.h → drivers/platform/chrome/cros_ec_lpc_mec.h

@@ -21,8 +21,8 @@
  * expensive.
  * expensive.
  */
  */
 
 
-#ifndef __LINUX_MFD_CROS_EC_MEC_H
-#define __LINUX_MFD_CROS_EC_MEC_H
+#ifndef __CROS_EC_LPC_MEC_H
+#define __CROS_EC_LPC_MEC_H
 
 
 #include <linux/mfd/cros_ec_commands.h>
 #include <linux/mfd/cros_ec_commands.h>
 
 
@@ -87,4 +87,4 @@ void cros_ec_lpc_mec_destroy(void);
 u8 cros_ec_lpc_io_bytes_mec(enum cros_ec_lpc_mec_io_type io_type,
 u8 cros_ec_lpc_io_bytes_mec(enum cros_ec_lpc_mec_io_type io_type,
 			    unsigned int offset, unsigned int length, u8 *buf);
 			    unsigned int offset, unsigned int length, u8 *buf);
 
 
-#endif /* __LINUX_MFD_CROS_EC_MEC_H */
+#endif /* __CROS_EC_LPC_MEC_H */

+ 2 - 1
drivers/platform/chrome/cros_ec_lpc_reg.c

@@ -24,7 +24,8 @@
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/mfd/cros_ec.h>
 #include <linux/mfd/cros_ec.h>
 #include <linux/mfd/cros_ec_commands.h>
 #include <linux/mfd/cros_ec_commands.h>
-#include <linux/mfd/cros_ec_lpc_mec.h>
+
+#include "cros_ec_lpc_mec.h"
 
 
 static u8 lpc_read_bytes(unsigned int offset, unsigned int length, u8 *dest)
 static u8 lpc_read_bytes(unsigned int offset, unsigned int length, u8 *dest)
 {
 {

+ 3 - 3
include/linux/mfd/cros_ec_lpc_reg.h → drivers/platform/chrome/cros_ec_lpc_reg.h

@@ -21,8 +21,8 @@
  * expensive.
  * expensive.
  */
  */
 
 
-#ifndef __LINUX_MFD_CROS_EC_REG_H
-#define __LINUX_MFD_CROS_EC_REG_H
+#ifndef __CROS_EC_LPC_REG_H
+#define __CROS_EC_LPC_REG_H
 
 
 /**
 /**
  * cros_ec_lpc_read_bytes - Read bytes from a given LPC-mapped address.
  * cros_ec_lpc_read_bytes - Read bytes from a given LPC-mapped address.
@@ -58,4 +58,4 @@ void cros_ec_lpc_reg_init(void);
  */
  */
 void cros_ec_lpc_reg_destroy(void);
 void cros_ec_lpc_reg_destroy(void);
 
 
-#endif /* __LINUX_MFD_CROS_EC_REG_H */
+#endif /* __CROS_EC_LPC_REG_H */