aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/wil6210/wmi.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-02-07 06:46:27 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-08 17:44:39 -0500
commit14f8dc49532f765968ff37c3b99edbeb99004ace (patch)
treea0c2f42ca545b3587a071ad05427c7351c8244e0 /drivers/net/wireless/ath/wil6210/wmi.c
parente9ba103931950da7bc87d58ffe39612df17d47af (diff)
drivers: net: Remove remaining alloc/OOM messages
alloc failures already get standardized OOM messages and a dump_stack. For the affected mallocs around these OOM messages: Converted kmallocs with multiplies to kmalloc_array. Converted a kmalloc/memcpy to kmemdup. Removed now unused stack variables. Removed unnecessary parentheses. Neatened alignment. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/wil6210/wmi.c')
-rw-r--r--drivers/net/wireless/ath/wil6210/wmi.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 0b70e17cd1fb..c8aca3d50089 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -587,11 +587,9 @@ void wmi_recv_cmd(struct wil6210_priv *wil)
587 evt = kmalloc(ALIGN(offsetof(struct pending_wmi_event, 587 evt = kmalloc(ALIGN(offsetof(struct pending_wmi_event,
588 event.wmi) + len, 4), 588 event.wmi) + len, 4),
589 GFP_KERNEL); 589 GFP_KERNEL);
590 if (!evt) { 590 if (!evt)
591 wil_err(wil, "kmalloc for WMI event (%d) failed\n",
592 len);
593 return; 591 return;
594 } 592
595 evt->event.hdr = hdr; 593 evt->event.hdr = hdr;
596 cmd = (void *)&evt->event.wmi; 594 cmd = (void *)&evt->event.wmi;
597 wil_memcpy_fromio_32(cmd, src, len); 595 wil_memcpy_fromio_32(cmd, src, len);
@@ -838,10 +836,8 @@ int wmi_set_ie(struct wil6210_priv *wil, u8 type, u16 ie_len, const void *ie)
838 int rc; 836 int rc;
839 u16 len = sizeof(struct wmi_set_appie_cmd) + ie_len; 837 u16 len = sizeof(struct wmi_set_appie_cmd) + ie_len;
840 struct wmi_set_appie_cmd *cmd = kzalloc(len, GFP_KERNEL); 838 struct wmi_set_appie_cmd *cmd = kzalloc(len, GFP_KERNEL);
841 if (!cmd) { 839 if (!cmd)
842 wil_err(wil, "kmalloc(%d) failed\n", len);
843 return -ENOMEM; 840 return -ENOMEM;
844 }
845 841
846 cmd->mgmt_frm_type = type; 842 cmd->mgmt_frm_type = type;
847 /* BUG: FW API define ieLen as u8. Will fix FW */ 843 /* BUG: FW API define ieLen as u8. Will fix FW */