staging: csr: remove CsrStrDup (5a0c09fd) · Commits · 戴 / test

drivers/staging/csr/csr_serialize_primitive_types.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,14 +49,14 @@ EXPORT_SYMBOL_GPL(CsrMemCpyDes);

		void CsrCharStringDes(char *value, u8 buffer, size_t *offset)
		{
		value = CsrStrDup((char ) &buffer[*offset]);
		value = kstrdup((char ) &buffer[*offset], GFP_KERNEL);
		offset += CsrStrLen(value) + 1;
		}
		EXPORT_SYMBOL_GPL(CsrCharStringDes);

		void CsrUtf8StringDes(u8 *value, u8 buffer, size_t *offset)
		{
		value = (u8 ) CsrStrDup((char ) &buffer[offset]);
		value = (u8 )kstrdup((char ) &buffer[offset], GFP_KERNEL);
		offset += CsrStrLen((char ) *value) + 1;
		}

+0 −20

Original line number	Diff line number	Diff line
		@@ -64,26 +64,6 @@ u32 CsrUtf8StringLengthInBytes(const u8 *string);
		*******************************************************************************/
		u8 CsrUtf8StrTruncate(u8 target, size_t count);

		/*******************************************************************************

		NAME
		CsrUtf8StrDup

		DESCRIPTION
		This function will allocate memory and copy the source string into the
		allocated memory, which is then returned as a duplicate of the original
		string. The memory returned must be freed by calling CsrPmemFree when
		the duplicate is no longer needed.

		PARAMETERS
		source - UTF-8 string to be duplicated.

		RETURNS
		Returns a duplicate of source.

		*******************************************************************************/
		u8 CsrUtf8StrDup(const u8 source);

		/*
		* UCS2
		*

+0 −5

Original line number	Diff line number	Diff line
		@@ -1053,8 +1053,3 @@ u8 CsrUtf8StrTruncate(u8 target, size_t count)

		return target;
		}

		u8 CsrUtf8StrDup(const u8 source)
		{
		return (u8 ) CsrStrDup((const char ) source);
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -58,21 +58,6 @@ s32 CsrVsnprintf(char string, size_t count, const char format, va_list args)
		}
		EXPORT_SYMBOL_GPL(CsrVsnprintf);

		char CsrStrDup(const char string)
		{
		char *copy;
		u32 len;

		copy = NULL;
		if (string != NULL)
		{
		len = CsrStrLen(string) + 1;
		copy = CsrPmemAlloc(len);
		CsrMemCpy(copy, string, len);
		}
		return copy;
		}

		MODULE_DESCRIPTION("CSR Operating System Kernel Abstraction");
		MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");
		MODULE_LICENSE("GPL and additional rights");

+0 −5

Original line number	Diff line number	Diff line
		@@ -35,11 +35,6 @@ size_t CsrStrLen(const char *string);
		#endif /* !CSR_USE_STDC_LIB */
		s32 CsrVsnprintf(char string, size_t count, const char format, va_list args);

		/------------------------------------------------------------------/
		/* Non-standard utility functions */
		/------------------------------------------------------------------/
		char CsrStrDup(const char string);

		#define CsrOffsetOf(st, m) ((size_t) & ((st *) 0)->m)

		#ifdef __cplusplus

Original line number	Diff line number	Diff line
		@@ -49,14 +49,14 @@ EXPORT_SYMBOL_GPL(CsrMemCpyDes);

		void CsrCharStringDes(char *value, u8 buffer, size_t *offset)
		{
		value = CsrStrDup((char ) &buffer[*offset]);
		value = kstrdup((char ) &buffer[*offset], GFP_KERNEL);
		offset += CsrStrLen(value) + 1;
		}
		EXPORT_SYMBOL_GPL(CsrCharStringDes);

		void CsrUtf8StringDes(u8 *value, u8 buffer, size_t *offset)
		{
		value = (u8 ) CsrStrDup((char ) &buffer[offset]);
		value = (u8 )kstrdup((char ) &buffer[offset], GFP_KERNEL);
		offset += CsrStrLen((char ) *value) + 1;
		}