From b63efa4f9c46f8399dd62959935698ec873ca65b Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:03:35 +0800 Subject: [PATCH] --- yaml --- r: 363437 b: refs/heads/master c: f4309c0f1463cdea69f958de169ed987fb4dfdb2 h: refs/heads/master i: 363435: 104bb220f8e38f87be100b26975a926c0ed3e747 v: v3 --- [refs] | 2 +- trunk/drivers/staging/csr/drv.c | 4 ++-- trunk/drivers/staging/csr/netdev.c | 2 +- trunk/drivers/staging/csr/sdio_mmc.c | 3 +-- trunk/drivers/staging/csr/sme_native.c | 2 +- trunk/drivers/staging/csr/unifi_pdu_processing.c | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 7d033c6f8bad..f33c41642dd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dd4a9665280eafc042d6420f6a21bf0d20c19d9 +refs/heads/master: f4309c0f1463cdea69f958de169ed987fb4dfdb2 diff --git a/trunk/drivers/staging/csr/drv.c b/trunk/drivers/staging/csr/drv.c index 3bd52fdeac3b..5520d6539f77 100644 --- a/trunk/drivers/staging/csr/drv.c +++ b/trunk/drivers/staging/csr/drv.c @@ -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 @@ -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); diff --git a/trunk/drivers/staging/csr/netdev.c b/trunk/drivers/staging/csr/netdev.c index 7dad26f70175..a0177d998978 100644 --- a/trunk/drivers/staging/csr/netdev.c +++ b/trunk/drivers/staging/csr/netdev.c @@ -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", diff --git a/trunk/drivers/staging/csr/sdio_mmc.c b/trunk/drivers/staging/csr/sdio_mmc.c index b6a16de08f4e..30271d35af55 100644 --- a/trunk/drivers/staging/csr/sdio_mmc.c +++ b/trunk/drivers/staging/csr/sdio_mmc.c @@ -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; diff --git a/trunk/drivers/staging/csr/sme_native.c b/trunk/drivers/staging/csr/sme_native.c index 525fe1bce0e6..ca55249bde3e 100644 --- a/trunk/drivers/staging/csr/sme_native.c +++ b/trunk/drivers/staging/csr/sme_native.c @@ -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, diff --git a/trunk/drivers/staging/csr/unifi_pdu_processing.c b/trunk/drivers/staging/csr/unifi_pdu_processing.c index 95efc360cc2d..bf7c00a815ed 100644 --- a/trunk/drivers/staging/csr/unifi_pdu_processing.c +++ b/trunk/drivers/staging/csr/unifi_pdu_processing.c @@ -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", @@ -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");