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

staging: csr: remove CsrInt16 typedef 



Use the in-kernel s16 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 8c87f69a

drivers/staging/csr/csr_types.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the eq 
typedef uint32_t CsrUint32;



/* Signed fixed width types */

typedef int16_t CsrInt16;

typedef int32_t CsrInt32;



/* Boolean */

drivers/staging/csr/csr_util.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ CsrCharString *CsrStrNCpyZero(CsrCharString *dest, 
/* Convert string with base 10 to integer */

CsrUint32 CsrStrToInt(const CsrCharString *str)

{

    CsrInt16 i;

    s16 i;

    CsrUint32 res;

    CsrUint32 digit;

drivers/staging/csr/csr_wifi_hip_card.h

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue 
/*****************************************************************************

 * CardClearFromHostDataSlot -

 */

void CardClearFromHostDataSlot(card_t *card, const CsrInt16 aSlotNum);

void CardClearFromHostDataSlot(card_t *card, const s16 aSlotNum);



#ifdef CSR_WIFI_REQUEUE_PACKET_TO_HAL

/*****************************************************************************
@@ -87,7 +87,7 @@ void CardClearFromHostDataSlot(card_t *card, const CsrInt16 aSlotNum); 
 * without freeing the bulk data

 */



void CardClearFromHostDataSlotWithoutFreeingBulkData(card_t *card, const CsrInt16 aSlotNum);

void CardClearFromHostDataSlotWithoutFreeingBulkData(card_t *card, const s16 aSlotNum);

#endif



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

drivers/staging/csr/csr_wifi_hip_card_sdio.c

+19 −19
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static CsrResult unifi_hip_init(card_t *card) 
static void _build_sdio_config_data(sdio_config_data_t *cfg_data,

                                    const u8     *cfg_data_buf)

{

    CsrInt16 offset = 0;

    s16 offset = 0;



    cfg_data->version = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(cfg_data_buf + offset);

    offset += SIZEOF_UINT16;
@@ -606,8 +606,8 @@ static CsrResult card_hw_init(card_t *card) 
    u8 cfg_data_buf[SDIO_CONFIG_DATA_SIZE];

    CsrResult r;

    void *dlpriv;

    CsrInt16 major, minor;

    CsrInt16 search_4slut_again;

    s16 major, minor;

    s16 search_4slut_again;

    CsrResult csrResult;



    func_enter();
@@ -1000,7 +1000,7 @@ static CsrResult card_hw_init(card_t *card) 
 */

static CsrResult card_wait_for_unifi_to_reset(card_t *card)

{

    CsrInt16 i;

    s16 i;

    CsrResult r;

    u8 io_enable;

    CsrResult csrResult;
@@ -1052,7 +1052,7 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card) 
        if (r == CSR_RESULT_SUCCESS)

        {

            u16 mbox2;

            CsrInt16 enabled = io_enable & (1 << card->function);

            s16 enabled = io_enable & (1 << card->function);



            if (!enabled)

            {
@@ -1132,7 +1132,7 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card) 
 */

static CsrResult card_wait_for_unifi_to_disable(card_t *card)

{

    CsrInt16 i;

    s16 i;

    CsrResult r;

    u8 io_enable;

    CsrResult csrResult;
@@ -1178,7 +1178,7 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) 
        }

        if (csrResult == CSR_RESULT_SUCCESS)

        {

            CsrInt16 enabled = io_enable & (1 << card->function);

            s16 enabled = io_enable & (1 << card->function);

            r = CSR_RESULT_SUCCESS;

            if (!enabled)

            {
@@ -1605,7 +1605,7 @@ void unifi_read_panic(card_t *card) 
 */

static CsrResult card_allocate_memory_resources(card_t *card)

{

    CsrInt16 n, i, k, r;

    s16 n, i, k, r;

    sdio_config_data_t *cfg_data;



    func_enter();
@@ -1837,7 +1837,7 @@ static void card_free_memory_resources(card_t *card) 


static void card_init_soft_queues(card_t *card)

{

    CsrInt16 i;

    s16 i;



    func_enter();
@@ -1876,7 +1876,7 @@ static void card_init_soft_queues(card_t *card) 
 */

void unifi_cancel_pending_signals(card_t *card)

{

    CsrInt16 i, n, r;

    s16 i, n, r;

    func_enter();



    unifi_trace(card->ospriv, UDBG1, "Canceling pending signals.\n");
@@ -2059,7 +2059,7 @@ static CsrResult card_init_slots(card_t *card) 
            func_exit_r(r);

            return r;

        }

        card->from_host_signals_w = (CsrInt16)s;

        card->from_host_signals_w = (s16)s;



        /* Get the to-host-signals-written count */

        r = unifi_card_read16(card, card->sdio_ctrl_addr + 6, &s);
@@ -2073,7 +2073,7 @@ static CsrResult card_init_slots(card_t *card) 
            func_exit_r(r);

            return r;

        }

        card->to_host_signals_r = (CsrInt16)s;

        card->to_host_signals_r = (s16)s;

    }



    /* Set Initialised flag. */
@@ -2350,7 +2350,7 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) 
 *      None.

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

 */

void CardClearFromHostDataSlot(card_t *card, const CsrInt16 slot)

void CardClearFromHostDataSlot(card_t *card, const s16 slot)

{

    u8 queue = card->from_host_data[slot].queue;

    const void *os_data_ptr = card->from_host_data[slot].bd.os_data_ptr;
@@ -2417,7 +2417,7 @@ void CardClearFromHostDataSlot(card_t *card, const CsrInt16 slot) 
 *      None.

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

 */

void CardClearFromHostDataSlotWithoutFreeingBulkData(card_t *card, const CsrInt16 slot)

void CardClearFromHostDataSlotWithoutFreeingBulkData(card_t *card, const s16 slot)

{

    u8 queue = card->from_host_data[slot].queue;
@@ -3405,7 +3405,7 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue 
    u16 i, slots[UNIFI_MAX_DATA_REFERENCES], j = 0;

    u8 *packed_sigptr, num_slots_required = 0;

    bulk_data_desc_t *bulkdata = csptr->bulkdata;

    CsrInt16 h, nslots;

    s16 h, nslots;



    func_enter();
@@ -3562,9 +3562,9 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue 
 *      Pointer to entry in bulk_data_slot array.

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

 */

bulk_data_desc_t* card_find_data_slot(card_t *card, CsrInt16 slot)

bulk_data_desc_t* card_find_data_slot(card_t *card, s16 slot)

{

    CsrInt16 sn;

    s16 sn;

    bulk_data_desc_t *bd;



    sn = slot & 0x7FFF;
@@ -3705,7 +3705,7 @@ CsrResult unifi_card_stop_processor(card_t *card, enum unifi_dbg_processors_sele 
{

    CsrResult r = CSR_RESULT_SUCCESS;

    u8 status;

    CsrInt16 retry = 100;

    s16 retry = 100;



    while (retry--)

    {
@@ -4103,7 +4103,7 @@ CsrResult unifi_check_io_status(card_t *card, CsrInt32 *status) 
void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo)

{

    CsrInt32 count_fhr;

    CsrInt16 t;

    s16 t;

    CsrUint32 occupied_fh;



    q_t *sigq;

drivers/staging/csr/csr_wifi_hip_card_sdio.h

+5 −5
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ struct card 
     * This is an optimisation that starts searching at a more likely point

     * than the beginning.

     */

    CsrInt16 from_host_data_head;

    s16 from_host_data_head;



    /* Dynamic slot allocation for queues */

    card_dynamic_slot_t dynamic_slot_data;
@@ -577,7 +577,7 @@ struct card 
#endif



    /* Auto-coredump */

    CsrInt16             request_coredump_on_reset; /* request coredump on next reset */

    s16             request_coredump_on_reset; /* request coredump on next reset */

    struct coredump_buf *dump_buf;                  /* root node */

    struct coredump_buf *dump_next_write;           /* node to fill at next dump */

    struct coredump_buf *dump_cur_read;             /* valid node to read, or NULL */
@@ -654,7 +654,7 @@ CsrResult unifi_set_host_state(card_t *card, enum unifi_host_state state); 


CsrResult unifi_set_proc_select(card_t *card, enum unifi_dbg_processors_select select);

CsrInt32 card_read_signal_counts(card_t *card);

bulk_data_desc_t* card_find_data_slot(card_t *card, CsrInt16 slot);

bulk_data_desc_t* card_find_data_slot(card_t *card, s16 slot);





CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata);
@@ -665,9 +665,9 @@ CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr); 
CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len);



CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle,

                        void *pdata, CsrUint32 len, CsrInt16 direction);

                        void *pdata, CsrUint32 len, s16 direction);

CsrResult unifi_bulk_rw_noretry(card_t *card, CsrUint32 handle,

                                void *pdata, CsrUint32 len, CsrInt16 direction);

                                void *pdata, CsrUint32 len, s16 direction);

#define UNIFI_SDIO_READ       0

#define UNIFI_SDIO_WRITE      1

CRA Git | Maintained and supported by SUSTech CRA and CCSE