Merge tag 'iommu-updates-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[linux-2.6-microblaze.git] / include / soc / tegra / mc.h

diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
index a5ef849..71ae37d 100644 (file)
--- a/include/soc/tegra/mc.h
+++ b/include/soc/tegra/mc.h
@@ -96,7 +96,6 @@ struct tegra_smmu_soc {
 
 struct tegra_mc;
 struct tegra_smmu;
-struct gart_device;
 
 #ifdef CONFIG_TEGRA_IOMMU_SMMU
 struct tegra_smmu *tegra_smmu_probe(struct device *dev,
@@ -116,28 +115,6 @@ static inline void tegra_smmu_remove(struct tegra_smmu *smmu)
 }
 #endif
 
-#ifdef CONFIG_TEGRA_IOMMU_GART
-struct gart_device *tegra_gart_probe(struct device *dev, struct tegra_mc *mc);
-int tegra_gart_suspend(struct gart_device *gart);
-int tegra_gart_resume(struct gart_device *gart);
-#else
-static inline struct gart_device *
-tegra_gart_probe(struct device *dev, struct tegra_mc *mc)
-{
-       return ERR_PTR(-ENODEV);
-}
-
-static inline int tegra_gart_suspend(struct gart_device *gart)
-{
-       return -ENODEV;
-}
-
-static inline int tegra_gart_resume(struct gart_device *gart)
-{
-       return -ENODEV;
-}
-#endif
-
 struct tegra_mc_reset {
        const char *name;
        unsigned long id;
@@ -185,8 +162,6 @@ struct tegra_mc_ops {
         */
        int (*probe)(struct tegra_mc *mc);
        void (*remove)(struct tegra_mc *mc);
-       int (*suspend)(struct tegra_mc *mc);
-       int (*resume)(struct tegra_mc *mc);
        irqreturn_t (*handle_irq)(int irq, void *data);
        int (*probe_device)(struct tegra_mc *mc, struct device *dev);
 };
@@ -225,7 +200,6 @@ struct tegra_mc {
        struct tegra_bpmp *bpmp;
        struct device *dev;
        struct tegra_smmu *smmu;
-       struct gart_device *gart;
        void __iomem *regs;
        void __iomem *bcast_ch_regs;
        void __iomem **ch_regs;