Merge "msm: smem: Remove smem_alloc()" (373c68f5) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/include/mach/msm_smem.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -156,7 +156,6 @@ enum {
		};

		#ifdef CONFIG_MSM_SMD
		void *smem_alloc(unsigned id, unsigned size);
		void *smem_alloc2(unsigned id, unsigned size_in);
		void smem_get_entry(unsigned id, unsigned size);
		void *smem_find(unsigned id, unsigned size);
		@@ -202,10 +201,6 @@ phys_addr_t smem_virt_to_phys(void *smem_address);
		int __init msm_smem_init(void);

		#else
		static inline void *smem_alloc(unsigned id, unsigned size)
		{
		return NULL;
		}
		static inline void *smem_alloc2(unsigned id, unsigned size_in)
		{
		return NULL;

+0 −9

Original line number	Diff line number	Diff line
		@@ -264,15 +264,6 @@ phys_addr_t smem_virt_to_phys(void *smem_address)
		}
		EXPORT_SYMBOL(smem_virt_to_phys);

		/* smem_alloc returns the pointer to smem item if it is already allocated.
		* Otherwise, it returns NULL.
		*/
		void *smem_alloc(unsigned id, unsigned size)
		{
		return smem_find(id, size);
		}
		EXPORT_SYMBOL(smem_alloc);

		/**
		* smem_alloc_to_proc - Find existing item with security support
		*