Skip to content

Commit

Permalink
driver: staging: csr: remove cast for kmalloc return value
Browse files Browse the repository at this point in the history
remove cast for kmalloc return value.

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Zhang Yanfei authored and Greg Kroah-Hartman committed Mar 12, 2013
1 parent 8dd4a96 commit f4309c0
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/csr/drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,7 @@ udi_log_event(ul_client_t *pcli,
}

/* Allocate log structure plus actual signal. */
logptr = (udi_log_t *)kmalloc(sizeof(udi_log_t) + total_len, GFP_KERNEL);
logptr = kmalloc(sizeof(udi_log_t) + total_len, GFP_KERNEL);

if (logptr == NULL) {
printk(KERN_ERR
Expand Down Expand Up @@ -1890,7 +1890,7 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
}

/* Allocate log structure plus actual signal. */
logptr = (udi_log_t *)kmalloc(sizeof(udi_log_t) + length, GFP_ATOMIC);
logptr = kmalloc(sizeof(udi_log_t) + length, GFP_ATOMIC);
if (logptr == NULL) {
unifi_error(priv, "Failed to allocate %d bytes for an SME message\n",
sizeof(udi_log_t) + length);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/csr/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2365,7 +2365,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
rx_buffered_packets_t *rx_q_item;
struct list_head *rx_list;

rx_q_item = (rx_buffered_packets_t *)kmalloc(sizeof(rx_buffered_packets_t),
rx_q_item = kmalloc(sizeof(rx_buffered_packets_t),
GFP_KERNEL);
if (rx_q_item == NULL) {
unifi_error(priv, "%s: Failed to allocate %d bytes for rx packet record\n",
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/csr/sdio_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1031,8 +1031,7 @@ uf_glue_sdio_probe(struct sdio_func *func,
sdio_func_id(func), instance);

/* Allocate context */
sdio_ctx = (CsrSdioFunction *)kmalloc(sizeof(CsrSdioFunction),
GFP_KERNEL);
sdio_ctx = kmalloc(sizeof(CsrSdioFunction), GFP_KERNEL);
if (sdio_ctx == NULL) {
sdio_release_host(func);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/csr/sme_native.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ sme_native_log_event(ul_client_t *pcli,
}

/* Allocate log structure plus actual signal. */
logptr = (udi_log_t *)kmalloc(sizeof(udi_log_t) + total_len, GFP_KERNEL);
logptr = kmalloc(sizeof(udi_log_t) + total_len, GFP_KERNEL);

if (logptr == NULL) {
unifi_error(priv,
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/csr/unifi_pdu_processing.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata,



tx_q_item = (tx_buffered_packets_t *)kmalloc(sizeof(tx_buffered_packets_t), GFP_ATOMIC);
tx_q_item = kmalloc(sizeof(tx_buffered_packets_t), GFP_ATOMIC);
if (tx_q_item == NULL) {
unifi_error(priv,
"Failed to allocate %d bytes for tx packet record\n",
Expand Down Expand Up @@ -3282,7 +3282,7 @@ void add_to_send_cfm_list(unifi_priv_t * priv,
{
tx_buffered_packets_t *send_cfm_list_item = NULL;

send_cfm_list_item = (tx_buffered_packets_t *) kmalloc(sizeof(tx_buffered_packets_t), GFP_ATOMIC);
send_cfm_list_item = kmalloc(sizeof(tx_buffered_packets_t), GFP_ATOMIC);

if(send_cfm_list_item == NULL){
unifi_warning(priv, "%s: Failed to allocate memory for new list item \n");
Expand Down

0 comments on commit f4309c0

Please sign in to comment.