Skip to content

L
linux
Commit a1a736df authored by sayli karnik's avatar sayli karnik Committed by Greg Kroah-Hartman
Browse files
Options

staging: ks7010: Remove the explicit cast on kmalloc 

The assignment operator implicitly converts a void pointer to the type of the
pointer it is assigned to. Hence an explicit cast on the result of the kmalloc
function is not required.
Signed-off-by: default avatarsayli karnik <karniksayli1995@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8abeaf8
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 31 deletions
drivers/staging/ks7010/ks_hostif.c
View file @ a1a736df
...@@ -1174,9 +1174,8 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet) ...@@ -1174,9 +1174,8 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet)
} }
DPRINTK(4, "skb_buff length=%d\n", packet_len); DPRINTK(4, "skb_buff length=%d\n", packet_len);
pp = (struct hostif_data_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp) + 6 + packet_len + 8),
kmalloc(hif_align_size(sizeof(*pp) + 6 + packet_len + 8), KS_WLAN_MEM_FLAG);
KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
...@@ -1317,8 +1316,7 @@ void hostif_mib_get_request(struct ks_wlan_private *priv, ...@@ -1317,8 +1316,7 @@ void hostif_mib_get_request(struct ks_wlan_private *priv,
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_mib_get_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1348,8 +1346,7 @@ void hostif_mib_set_request(struct ks_wlan_private *priv, ...@@ -1348,8 +1346,7 @@ void hostif_mib_set_request(struct ks_wlan_private *priv,
} }
/* make primitive */ /* make primitive */
pp = (struct hostif_mib_set_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp) + size), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp) + size), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1378,8 +1375,7 @@ void hostif_start_request(struct ks_wlan_private *priv, unsigned char mode) ...@@ -1378,8 +1375,7 @@ void hostif_start_request(struct ks_wlan_private *priv, unsigned char mode)
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_start_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1406,8 +1402,7 @@ void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv) ...@@ -1406,8 +1402,7 @@ void hostif_ps_adhoc_set_request(struct ks_wlan_private *priv)
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_ps_adhoc_set_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1450,8 +1445,7 @@ void hostif_infrastructure_set_request(struct ks_wlan_private *priv) ...@@ -1450,8 +1445,7 @@ void hostif_infrastructure_set_request(struct ks_wlan_private *priv)
DPRINTK(3, "ssid.size=%d\n", priv->reg.ssid.size); DPRINTK(3, "ssid.size=%d\n", priv->reg.ssid.size);
/* make primitive */ /* make primitive */
pp = (struct hostif_infrastructure_set_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1517,8 +1511,7 @@ static void hostif_infrastructure_set2_request(struct ks_wlan_private *priv) ...@@ -1517,8 +1511,7 @@ static void hostif_infrastructure_set2_request(struct ks_wlan_private *priv)
DPRINTK(2, "ssid.size=%d\n", priv->reg.ssid.size); DPRINTK(2, "ssid.size=%d\n", priv->reg.ssid.size);
/* make primitive */ /* make primitive */
pp = (struct hostif_infrastructure_set2_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1587,8 +1580,7 @@ void hostif_adhoc_set_request(struct ks_wlan_private *priv) ...@@ -1587,8 +1580,7 @@ void hostif_adhoc_set_request(struct ks_wlan_private *priv)
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_adhoc_set_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1633,8 +1625,7 @@ void hostif_adhoc_set2_request(struct ks_wlan_private *priv) ...@@ -1633,8 +1625,7 @@ void hostif_adhoc_set2_request(struct ks_wlan_private *priv)
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_adhoc_set2_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1681,8 +1672,7 @@ void hostif_stop_request(struct ks_wlan_private *priv) ...@@ -1681,8 +1672,7 @@ void hostif_stop_request(struct ks_wlan_private *priv)
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_stop_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1704,8 +1694,7 @@ void hostif_phy_information_request(struct ks_wlan_private *priv) ...@@ -1704,8 +1694,7 @@ void hostif_phy_information_request(struct ks_wlan_private *priv)
DPRINTK(3, "\n"); DPRINTK(3, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_phy_information_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1736,8 +1725,7 @@ void hostif_power_mngmt_request(struct ks_wlan_private *priv, ...@@ -1736,8 +1725,7 @@ void hostif_power_mngmt_request(struct ks_wlan_private *priv,
DPRINTK(3, "mode=%lu wake_up=%lu receiveDTIMs=%lu\n", mode, wake_up, DPRINTK(3, "mode=%lu wake_up=%lu receiveDTIMs=%lu\n", mode, wake_up,
receiveDTIMs); receiveDTIMs);
/* make primitive */ /* make primitive */
pp = (struct hostif_power_mngmt_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1763,8 +1751,7 @@ void hostif_sleep_request(struct ks_wlan_private *priv, unsigned long mode) ...@@ -1763,8 +1751,7 @@ void hostif_sleep_request(struct ks_wlan_private *priv, unsigned long mode)
if (mode == SLP_SLEEP) { if (mode == SLP_SLEEP) {
/* make primitive */ /* make primitive */
pp = (struct hostif_sleep_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1797,8 +1784,7 @@ void hostif_bss_scan_request(struct ks_wlan_private *priv, ...@@ -1797,8 +1784,7 @@ void hostif_bss_scan_request(struct ks_wlan_private *priv,
DPRINTK(2, "\n"); DPRINTK(2, "\n");
/* make primitive */ /* make primitive */
pp = (struct hostif_bss_scan_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
...@@ -1854,8 +1840,7 @@ void hostif_mic_failure_request(struct ks_wlan_private *priv, ...@@ -1854,8 +1840,7 @@ void hostif_mic_failure_request(struct ks_wlan_private *priv,
DPRINTK(3, "count=%d :: timer=%d\n", failure_count, timer); DPRINTK(3, "count=%d :: timer=%d\n", failure_count, timer);
/* make primitive */ /* make primitive */
pp = (struct hostif_mic_failure_request_t *) pp = kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
kmalloc(hif_align_size(sizeof(*pp)), KS_WLAN_MEM_FLAG);
if (!pp) { if (!pp) {
DPRINTK(3, "allocate memory failed..\n"); DPRINTK(3, "allocate memory failed..\n");
return; return;
......
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