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

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

staging: csr: remove CsrInt32 typedef 



Use the in-kernel s32 type 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 26a6b2e1

drivers/staging/csr/csr_formatted_io.c

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

#include "csr_util.h"



CsrInt32 CsrSnprintf(CsrCharString *dest, CsrSize n, const CsrCharString *fmt, ...)

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

{

    CsrInt32 r;

    s32 r;

    va_list args;

    va_start(args, fmt);

    r = CsrVsnprintf(dest, n, fmt, 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"



CsrInt32 CsrSnprintf(CsrCharString *dest, CsrSize n, const CsrCharString *fmt, ...);

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



#ifdef __cplusplus

}

drivers/staging/csr/csr_time.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ void CsrTimeUtcGet(CsrTimeUtc *tod, CsrTime *low, CsrTime *high); 
 *      CsrTime - "t1" - "t2".

 *

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

#define CsrTimeSub(t1, t2)    ((CsrInt32) (t1) - (CsrInt32) (t2))

#define CsrTimeSub(t1, t2)    ((s32) (t1) - (s32) (t2))



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

 *  NAME

drivers/staging/csr/csr_types.h

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointer 
typedef uintptr_t CsrUintptr;   /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */

typedef ptrdiff_t CsrIntptr;    /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */



/* Signed fixed width types */

typedef int32_t CsrInt32;



/* Boolean */

typedef u8 CsrBool;

drivers/staging/csr/csr_unicode.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ CsrUtf16String *CsrUtf16ConcatenateTexts(const CsrUtf16String *inputText1, const 
CsrUtf16String *CsrUtf16String2XML(CsrUtf16String *str);

CsrUtf16String *CsrXML2Utf16String(CsrUtf16String *str);



CsrInt32 CsrUtf8StrCmp(const CsrUtf8String *string1, const CsrUtf8String *string2);

CsrInt32 CsrUtf8StrNCmp(const CsrUtf8String *string1, const CsrUtf8String *string2, CsrSize count);

s32 CsrUtf8StrCmp(const CsrUtf8String *string1, const CsrUtf8String *string2);

s32 CsrUtf8StrNCmp(const CsrUtf8String *string1, const CsrUtf8String *string2, CsrSize count);

u32 CsrUtf8StringLengthInBytes(const CsrUtf8String *string);



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