Merge "ion: Cleanup stubs for secure buffers" (84d73ecf) · Commits · e / devices / android_kernel_sony_msm8994

drivers/staging/android/ion/msm/ion_cp_common.h

+1 −17

Original line number	Diff line number	Diff line
		@@ -74,11 +74,6 @@ int ion_cp_secure_buffer(struct ion_buffer buffer, int version, void data,

		int ion_cp_unsecure_buffer(struct ion_buffer *buffer, int force_unsecure);

		int msm_ion_secure_table(struct sg_table *table, enum cp_mem_usage usage,
		int flags);

		int msm_ion_unsecure_table(struct sg_table *table);

		bool msm_secure_v2_is_supported(void);

		#else
		@@ -115,18 +110,7 @@ static inline int ion_cp_unsecure_buffer(struct ion_buffer *buffer,
		return -ENODEV;
		}

		int msm_ion_secure_table(struct sg_table *table, enum cp_mem_usage usage,
		int flags)
		{
		return -ENODEV;
		}

		int msm_ion_unsecure_table(struct sg_table *table)
		{
		return -ENODEV;
		}

		bool msm_secure_v2_is_supported(void)
		static inline bool msm_secure_v2_is_supported(void)
		{
		return false;
		}