Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4fda8db authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: csr: remove CsrSize typedef 



Use size_t instead.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5379b13d

drivers/staging/csr/csr_formatted_io.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "csr_formatted_io.h"

#include "csr_util.h"



s32 CsrSnprintf(char *dest, CsrSize n, const char *fmt, ...)

s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)

{

    s32 r;

    va_list args;

drivers/staging/csr/csr_formatted_io.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern "C" { 


#include "csr_types.h"



s32 CsrSnprintf(char *dest, CsrSize n, const char *fmt, ...);

s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...);



#ifdef __cplusplus

}

drivers/staging/csr/csr_framework_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ EXPORT_SYMBOL_GPL(CsrThreadSleep); 
 *      Allocated memory is zero initialised.

 *

 *----------------------------------------------------------------------------*/

void *CsrMemCalloc(CsrSize numberOfElements, CsrSize elementSize)

void *CsrMemCalloc(size_t numberOfElements, size_t elementSize)

{

    void *buf;

    size_t size;
@@ -189,7 +189,7 @@ void *CsrMemCalloc(CsrSize numberOfElements, CsrSize elementSize) 
 *      Allocated memory is not initialised.

 *

 *----------------------------------------------------------------------------*/

void *CsrMemAlloc(CsrSize size)

void *CsrMemAlloc(size_t size)

{

    return kmalloc(size, GFP_KERNEL);

}
@@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(CsrMemFree); 
 *      Allocated memory is not initialised.

 *

 *----------------------------------------------------------------------------*/

void *CsrMemAllocDma(CsrSize size)

void *CsrMemAllocDma(size_t size)

{

    return kmalloc(size, GFP_KERNEL | GFP_DMA);

}

drivers/staging/csr/csr_framework_ext.h

+6 −6
Original line number Diff line number Diff line
@@ -256,11 +256,11 @@ void CsrThreadSleep(u16 sleepTimeInMs); 
 *

 *----------------------------------------------------------------------------*/

#ifdef CSR_MEM_DEBUG

void *CsrMemAllocDebug(CsrSize size,

void *CsrMemAllocDebug(size_t size,

    const char *file, u32 line);

#define CsrMemAlloc(sz) CsrMemAllocDebug((sz), __FILE__, __LINE__)

#else

void *CsrMemAlloc(CsrSize size);

void *CsrMemAlloc(size_t size);

#endif



/*----------------------------------------------------------------------------*
@@ -277,11 +277,11 @@ void *CsrMemAlloc(CsrSize size); 
 *

 *----------------------------------------------------------------------------*/

#ifdef CSR_MEM_DEBUG

void *CsrMemCallocDebug(CsrSize numberOfElements, CsrSize elementSize,

void *CsrMemCallocDebug(size_t numberOfElements, size_t elementSize,

    const char *file, u32 line);

#define CsrMemCalloc(cnt, sz) CsrMemAllocDebug((cnt), (sz), __FILE__, __LINE__)

#else

void *CsrMemCalloc(CsrSize numberOfElements, CsrSize elementSize);

void *CsrMemCalloc(size_t numberOfElements, size_t elementSize);

#endif



/*----------------------------------------------------------------------------*
@@ -310,11 +310,11 @@ void CsrMemFree(void *pointer); 
 *

 *----------------------------------------------------------------------------*/

#ifdef CSR_MEM_DEBUG

void *CsrMemAllocDmaDebug(CsrSize size,

void *CsrMemAllocDmaDebug(size_t size,

    const char *file, u32 line);

#define CsrMemAllocDma(sz) CsrMemAllocDmaDebug((sz), __FILE__, __LINE__)

#else

void *CsrMemAllocDma(CsrSize size);

void *CsrMemAllocDma(size_t size);

#endif

drivers/staging/csr/csr_log_text.h

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void CsrLogTextRegister(CsrLogTextTaskId taskId, const char *taskName, u16 subOr 
   system as a whole. */

#if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_CRITICAL_DISABLE)

void CsrLogTextCritical(CsrLogTextTaskId taskId, u16 subOrigin, const char *formatString, ...);

void CsrLogTextBufferCritical(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const char *formatString, ...);

void CsrLogTextBufferCritical(CsrLogTextTaskId taskId, u16 subOrigin, size_t bufferLength, const void *buffer, const char *formatString, ...);

#define CSR_LOG_TEXT_CRITICAL(taskId_subOrigin_formatString_varargs) CsrLogTextCritical taskId_subOrigin_formatString_varargs

#define CSR_LOG_TEXT_CONDITIONAL_CRITICAL(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_CRITICAL(logtextargs);}}

#define CSR_LOG_TEXT_BUFFER_CRITICAL(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferCritical taskId_subOrigin_length_buffer_formatString_varargs
@@ -50,7 +50,7 @@ void CsrLogTextBufferCritical(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bu 
   causing lack of functionality but not loss of system integrity/stability. */

#if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_ERROR_DISABLE)

void CsrLogTextError(CsrLogTextTaskId taskId, u16 subOrigin, const char *formatString, ...);

void CsrLogTextBufferError(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const char *formatString, ...);

void CsrLogTextBufferError(CsrLogTextTaskId taskId, u16 subOrigin, size_t bufferLength, const void *buffer, const char *formatString, ...);

#define CSR_LOG_TEXT_ERROR(taskId_subOrigin_formatString_varargs) CsrLogTextError taskId_subOrigin_formatString_varargs

#define CSR_LOG_TEXT_CONDITIONAL_ERROR(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_ERROR(logtextargs);}}

#define CSR_LOG_TEXT_BUFFER_ERROR(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferError taskId_subOrigin_length_buffer_formatString_varargs
@@ -67,7 +67,7 @@ void CsrLogTextBufferError(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize buffe 
   lead to malfunction of the component. */

#if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_WARNING_DISABLE)

void CsrLogTextWarning(CsrLogTextTaskId taskId, u16 subOrigin, const char *formatString, ...);

void CsrLogTextBufferWarning(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const char *formatString, ...);

void CsrLogTextBufferWarning(CsrLogTextTaskId taskId, u16 subOrigin, size_t bufferLength, const void *buffer, const char *formatString, ...);

#define CSR_LOG_TEXT_WARNING(taskId_subOrigin_formatString_varargs) CsrLogTextWarning taskId_subOrigin_formatString_varargs

#define CSR_LOG_TEXT_CONDITIONAL_WARNING(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_WARNING(logtextargs);}}

#define CSR_LOG_TEXT_BUFFER_WARNING(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferWarning taskId_subOrigin_length_buffer_formatString_varargs
@@ -83,7 +83,7 @@ void CsrLogTextBufferWarning(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize buf 
   the more severe conditions are encountered. */

#if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_INFO_DISABLE)

void CsrLogTextInfo(CsrLogTextTaskId taskId, u16 subOrigin, const char *formatString, ...);

void CsrLogTextBufferInfo(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const char *formatString, ...);

void CsrLogTextBufferInfo(CsrLogTextTaskId taskId, u16 subOrigin, size_t bufferLength, const void *buffer, const char *formatString, ...);

#define CSR_LOG_TEXT_INFO(taskId_subOrigin_formatString_varargs) CsrLogTextInfo taskId_subOrigin_formatString_varargs

#define CSR_LOG_TEXT_CONDITIONAL_INFO(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_INFO(logtextargs);}}

#define CSR_LOG_TEXT_BUFFER_INFO(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferInfo taskId_subOrigin_length_buffer_formatString_varargs
@@ -98,7 +98,7 @@ void CsrLogTextBufferInfo(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize buffer 
/* DEBUG: Similar to INFO, but dedicated to events that occur more frequently. */

#if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_DEBUG_DISABLE)

void CsrLogTextDebug(CsrLogTextTaskId taskId, u16 subOrigin, const char *formatString, ...);

void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const char *formatString, ...);

void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, u16 subOrigin, size_t bufferLength, const void *buffer, const char *formatString, ...);

#define CSR_LOG_TEXT_DEBUG(taskId_subOrigin_formatString_varargs) CsrLogTextDebug taskId_subOrigin_formatString_varargs

#define CSR_LOG_TEXT_CONDITIONAL_DEBUG(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_DEBUG(logtextargs);}}

#define CSR_LOG_TEXT_BUFFER_DEBUG(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferDebug taskId_subOrigin_length_buffer_formatString_varargs