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

staging: csr: remove CsrInt8 typedef 



Use the in-kernel s8 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 7e6f5794

drivers/staging/csr/csr_types.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ typedef uint16_t CsrUint16; 
typedef uint32_t CsrUint32;



/* Signed fixed width types */

typedef int8_t CsrInt8;

typedef int16_t CsrInt16;

typedef int32_t CsrInt32;

drivers/staging/csr/csr_utf16.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
*       F1-F3    80-BF    80-BF    80-BF

*       F4       80-8F    80-BF    80-BF

*/

static const CsrInt8 trailingBytesForUtf8[256] =

static const s8 trailingBytesForUtf8[256] =

{

    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                 /* 0x00 - 0x1F */

    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                 /* 0x20 - 0x3F */
@@ -568,7 +568,7 @@ CsrUtf16String *CsrUtf82Utf16String(const CsrUtf8String *utf8String) 
    CsrSize sourceLength;

    CsrUtf16String *dest = NULL;

    CsrUtf16String *destStart = NULL;

    CsrInt8 extraBytes2Read;

    s8 extraBytes2Read;



    if (!utf8String)

    {

drivers/staging/csr/csr_wifi_hip_card.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr); 
CsrResult unifi_dl_firmware(card_t *card, void *arg);

CsrResult unifi_dl_patch(card_t *card, void *arg, CsrUint32 boot_ctrl);

CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode);

void* unifi_dl_fw_read_start(card_t *card, CsrInt8 is_fw);

void* unifi_dl_fw_read_start(card_t *card, s8 is_fw);



CsrResult unifi_coredump_handle_request(card_t *card);

drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c

+4 −4
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata) 
 *      even address is read.

 * ---------------------------------------------------------------------------

 */

static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, CsrInt8 m, CsrUint32 *num)

static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, s8 m, CsrUint32 *num)

{

    CsrResult r;

    CsrUint32 i;
@@ -583,7 +583,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd 
        }



        *cptr++ = ((u8)w & 0xFF);

        if ((m >= 0) && (((CsrInt8)w & 0xFF) == m))

        if ((m >= 0) && (((s8)w & 0xFF) == m))

        {

            break;

        }
@@ -595,7 +595,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd 
        }



        *cptr++ = ((u8)(w >> 8) & 0xFF);

        if ((m >= 0) && (((CsrInt8)(w >> 8) & 0xFF) == m))

        if ((m >= 0) && (((s8)(w >> 8) & 0xFF) == m))

        {

            break;

        }
@@ -1278,7 +1278,7 @@ CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata) 
 *      CSR_WIFI_HIP_RESULT_INVALID_VALUE  a bad generic pointer was specified

 * ---------------------------------------------------------------------------

 */

CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, CsrInt8 match)

CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, s8 match)

{

    CsrUint32 sdio_addr;

    CsrResult r;

drivers/staging/csr/csr_wifi_hip_download.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, CsrUint32 boot_ctrl) 
} /* unifi_dl_patch() */





void* unifi_dl_fw_read_start(card_t *card, CsrInt8 is_fw)

void* unifi_dl_fw_read_start(card_t *card, s8 is_fw)

{

    card_info_t card_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE