Skip to content

L
linux
Commit c4f9e644 authored by Devendra Naga's avatar Devendra Naga Committed by Greg Kroah-Hartman
Browse files
Options

staging:csr: remove usage of CsrSnprintf and use scnprintf 

This change tries to achieve the removal of the csr driver defined snprintf
and uses the kernel defined snprintf.

After this change i got following build warnings, which are solved in this patch

warnings generated:

drivers/staging/csr/io.c:929:13: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
drivers/staging/csr/io.c:929:13: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 5 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c: In function ‘unifi_print_status’:
drivers/staging/csr/csr_wifi_hip_udi.c:78:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c:151:27: warning: format ‘%u’ expects type ‘unsigned int’, but argument 5 has type ‘long int’
drivers/staging/csr/csr_wifi_hip_udi.c:257:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c:257:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 5 has type ‘u32’
drivers/staging/csr/csr_wifi_hip_udi.c:261:27: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘u32’
Signed-off-by: default avatarDevendra Naga <develkernel412222@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f870fe6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 120 deletions
drivers/staging/csr/Makefile
View file @ c4f9e644
......@@ -25,7 +25,6 @@ csr_wifi-y := bh.o \
unifi_event.o \
unifi_pdu_processing.o \
unifi_sme.o \
csr_formatted_io.o \
csr_wifi_hip_card_sdio.o \
csr_wifi_hip_card_sdio_intr.o \
csr_wifi_hip_card_sdio_mem.o \
......
drivers/staging/csr/csr_formatted_io.c deleted 100644 → 0
View file @ 4f870fe6
/*****************************************************************************
(c) Cambridge Silicon Radio Limited 2010
All rights reserved and confidential information of CSR
Refer to LICENSE.txt included with this source for details
on the license terms.
*****************************************************************************/
#include <linux/kernel.h>
#include "csr_formatted_io.h"
s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)
{
s32 r;
va_list args;
va_start(args, fmt);
r = vsnprintf(dest, n, fmt, args);
va_end(args);
if (dest && (n > 0))
{
dest[n - 1] = '\0';
}
return r;
}
drivers/staging/csr/csr_formatted_io.h deleted 100644 → 0
View file @ 4f870fe6
#ifndef CSR_FORMATTED_IO_H__
#define CSR_FORMATTED_IO_H__
/*****************************************************************************
(c) Cambridge Silicon Radio Limited 2010
All rights reserved and confidential information of CSR
Refer to LICENSE.txt included with this source for details
on the license terms.
*****************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif
#include <linux/types.h>
s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...);
#ifdef __cplusplus
}
#endif
#endif
drivers/staging/csr/csr_wifi_hip_card_sdio.c
View file @ c4f9e644
......@@ -1612,13 +1612,13 @@ static CsrResult card_allocate_memory_resources(card_t *card)
/* Reset any state carried forward from a previous life */
card->fh_command_queue.q_rd_ptr = 0;
card->fh_command_queue.q_wr_ptr = 0;
(void)CsrSnprintf(card->fh_command_queue.name, UNIFI_QUEUE_NAME_MAX_LENGTH,
(void)scnprintf(card->fh_command_queue.name, UNIFI_QUEUE_NAME_MAX_LENGTH,
"fh_cmd_q");
for (i = 0; i < UNIFI_NO_OF_TX_QS; i++)
{
card->fh_traffic_queue[i].q_rd_ptr = 0;
card->fh_traffic_queue[i].q_wr_ptr = 0;
(void)CsrSnprintf(card->fh_traffic_queue[i].name,
(void)scnprintf(card->fh_traffic_queue[i].name,
UNIFI_QUEUE_NAME_MAX_LENGTH, "fh_data_q%d", i);
}
#ifndef CSR_WIFI_HIP_TA_DISABLE
......@@ -1826,13 +1826,13 @@ static void card_init_soft_queues(card_t *card)
/* Reset any state carried forward from a previous life */
card->fh_command_queue.q_rd_ptr = 0;
card->fh_command_queue.q_wr_ptr = 0;
(void)CsrSnprintf(card->fh_command_queue.name, UNIFI_QUEUE_NAME_MAX_LENGTH,
(void)scnprintf(card->fh_command_queue.name, UNIFI_QUEUE_NAME_MAX_LENGTH,
"fh_cmd_q");
for (i = 0; i < UNIFI_NO_OF_TX_QS; i++)
{
card->fh_traffic_queue[i].q_rd_ptr = 0;
card->fh_traffic_queue[i].q_wr_ptr = 0;
(void)CsrSnprintf(card->fh_traffic_queue[i].name,
(void)scnprintf(card->fh_traffic_queue[i].name,
UNIFI_QUEUE_NAME_MAX_LENGTH, "fh_data_q%d", i);
}
#ifndef CSR_WIFI_HIP_TA_DISABLE
......
drivers/staging/csr/csr_wifi_hip_udi.c
View file @ c4f9e644
This diff is collapsed.
drivers/staging/csr/csr_wifi_hip_unifi.h
View file @ c4f9e644
......@@ -98,7 +98,6 @@ extern "C" {
#include "csr_framework_ext.h" /* from the synergy porting folder */
#include "csr_sdio.h" /* from the synergy porting folder */
#include "csr_macro.h" /* from the synergy porting folder */
#include "csr_formatted_io.h" /* from the synergy gsp folder */
#include "csr_wifi_result.h"
/* Utility MACROS. Note that UNIFI_MAC_ADDRESS_CMP returns TRUE on success */
......
drivers/staging/csr/io.c
View file @ c4f9e644
......@@ -347,7 +347,7 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev)
/*
* We use the slot number as unifi device index.
*/
snprintf(priv->proc_entry_name, 64, "driver/unifi%d", priv->instance);
scnprintf(priv->proc_entry_name, 64, "driver/unifi%d", priv->instance);
/*
* The following complex casting is in place in order to eliminate 64-bit compilation warning
* "cast to/from pointer from/to integer of different size"
......@@ -904,54 +904,54 @@ uf_read_proc(char *page, char **start, off_t offset, int count,
orig_p = p;
written = CsrSnprintf(p, remain, "UniFi SDIO Driver: %s %s %s\n",
written = scnprintf(p, remain, "UniFi SDIO Driver: %s %s %s\n",
CSR_WIFI_VERSION, __DATE__, __TIME__);
UNIFI_SNPRINTF_RET(p, remain, written);
#ifdef CSR_SME_USERSPACE
written = CsrSnprintf(p, remain, "SME: CSR userspace ");
written = scnprintf(p, remain, "SME: CSR userspace ");
UNIFI_SNPRINTF_RET(p, remain, written);
#ifdef CSR_SUPPORT_WEXT
written = CsrSnprintf(p, remain, "with WEXT support\n");
written = scnprintf(p, remain, "with WEXT support\n");
#else
written = CsrSnprintf(p, remain, "\n");
written = scnprintf(p, remain, "\n");
#endif /* CSR_SUPPORT_WEXT */
UNIFI_SNPRINTF_RET(p, remain, written);
#endif /* CSR_SME_USERSPACE */
#ifdef CSR_NATIVE_LINUX
written = CsrSnprintf(p, remain, "SME: native\n");
written = scnprintf(p, remain, "SME: native\n");
UNIFI_SNPRINTF_RET(p, remain, written);
#endif
#ifdef CSR_SUPPORT_SME
written = CsrSnprintf(p, remain,
"Firmware (ROM) build:%lu, Patch:%lu\n",
written = scnprintf(p, remain,
"Firmware (ROM) build:%u, Patch:%u\n",
priv->card_info.fw_build,
priv->sme_versions.firmwarePatch);
UNIFI_SNPRINTF_RET(p, remain, written);
#endif
p += unifi_print_status(priv->card, p, &remain);
written = CsrSnprintf(p, remain, "Last dbg str: %s\n",
written = scnprintf(p, remain, "Last dbg str: %s\n",
priv->last_debug_string);
UNIFI_SNPRINTF_RET(p, remain, written);
written = CsrSnprintf(p, remain, "Last dbg16:");
written = scnprintf(p, remain, "Last dbg16:");
UNIFI_SNPRINTF_RET(p, remain, written);
for (i = 0; i < 8; i++) {
written = CsrSnprintf(p, remain, " %04X",
written = scnprintf(p, remain, " %04X",
priv->last_debug_word16[i]);
UNIFI_SNPRINTF_RET(p, remain, written);
}
written = CsrSnprintf(p, remain, "\n");
written = scnprintf(p, remain, "\n");
UNIFI_SNPRINTF_RET(p, remain, written);
written = CsrSnprintf(p, remain, " ");
written = scnprintf(p, remain, " ");
UNIFI_SNPRINTF_RET(p, remain, written);
for (; i < 16; i++) {
written = CsrSnprintf(p, remain, " %04X",
written = scnprintf(p, remain, " %04X",
priv->last_debug_word16[i]);
UNIFI_SNPRINTF_RET(p, remain, written);
}
written = CsrSnprintf(p, remain, "\n");
written = scnprintf(p, remain, "\n");
UNIFI_SNPRINTF_RET(p, remain, written);
*start = page;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7