video: tegra: host: Fix includes
Juha Tukkinen [Mon, 2 Jan 2012 15:18:38 +0000 (17:18 +0200)]
Remove one duplicate include and relative paths in includes. Replace one
include with forward declaration. Make dependencies to t20 and t30
explicit.

Change-Id: I195020bedbb46277dbd6a92b65be2cde5f6276b8
Reviewed-on: http://git-master/r/72903
Signed-off-by: Juha Tukkinen <jtukkinen@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/75885
Reviewed-by: Automatic_Commit_Validation_User

drivers/video/tegra/host/chip_support.h
drivers/video/tegra/host/dev.c
drivers/video/tegra/host/gr3d/scale3d.c
drivers/video/tegra/host/t20/t20.h
drivers/video/tegra/host/t30/t30.c
drivers/video/tegra/host/t30/t30.h

index a8fedf2..16ec7bf 100644 (file)
@@ -138,8 +138,4 @@ struct nvhost_chip_support {
 
 };
 
-
-int nvhost_init_t20_support(struct nvhost_master *host);
-int nvhost_init_t30_support(struct nvhost_master *host);
-
 #endif /* _NVHOST_CHIP_SUPPORT_H_ */
index 6ea8cba..c7b1ebf 100644 (file)
@@ -45,6 +45,8 @@
 
 #include "debug.h"
 #include "nvhost_job.h"
+#include "t20/t20.h"
+#include "t30/t30.h"
 
 #define DRIVER_NAME "tegra_grhost"
 #define IFACE_NAME "nvhost"
index e7ef19a..969d607 100644 (file)
@@ -42,7 +42,7 @@
 #include <mach/clk.h>
 #include <mach/hardware.h>
 #include "scale3d.h"
-#include "../dev.h"
+#include "dev.h"
 
 static int scale3d_is_enabled(void);
 static void scale3d_enable(int enable);
index c7eac39..20bb136 100644 (file)
@@ -30,6 +30,7 @@ int nvhost_init_t20_debug_support(struct nvhost_master *);
 int nvhost_init_t20_syncpt_support(struct nvhost_master *);
 int nvhost_init_t20_intr_support(struct nvhost_master *);
 int nvhost_init_t20_cpuaccess_support(struct nvhost_master *);
+int nvhost_init_t20_support(struct nvhost_master *host);
 int nvhost_t20_save_context(struct nvhost_module *mod, u32 syncpt_id);
 
 #endif /* _NVHOST_T20_H_ */
index 9347689..7e1a093 100644 (file)
@@ -23,6 +23,7 @@
 #include <linux/mutex.h>
 #include <mach/powergate.h>
 #include "dev.h"
+#include "t20/t20.h"
 #include "t30.h"
 #include "gr3d/gr3d.h"
 #include "mpe/mpe.h"
@@ -31,8 +32,7 @@
 #include "host1x/host1x_hardware.h"
 #include "host1x/host1x_cdma.h"
 #include "host1x/host1x_syncpt.h"
-#include "gr3d/scale3d.h"
-#include "../chip_support.h"
+#include "chip_support.h"
 
 #define NVMODMUTEX_2D_FULL   (1)
 #define NVMODMUTEX_2D_SIMPLE (2)
index 4c0c2d1..5b547d2 100644 (file)
 #ifndef _NVHOST_T30_H_
 #define _NVHOST_T30_H_
 
-#include "../t20/t20.h"
+struct nvhost_master;
 
 int nvhost_init_t30_channel_support(struct nvhost_master *);
 int nvhost_init_t30_debug_support(struct nvhost_master *);
+int nvhost_init_t30_support(struct nvhost_master *host);
 
 #endif /* _NVHOST_T30_H_ */