mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +00:00
drivers/net/wireless/wl12xx: Use kmemdup
Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
3289a8368c
commit
929ebd30e4
@ -576,7 +576,7 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
|
||||
goto out;
|
||||
}
|
||||
|
||||
wl->nvs = kzalloc(sizeof(struct wl1271_nvs_file), GFP_KERNEL);
|
||||
wl->nvs = kmemdup(fw->data, sizeof(struct wl1271_nvs_file), GFP_KERNEL);
|
||||
|
||||
if (!wl->nvs) {
|
||||
wl1271_error("could not allocate memory for the nvs file");
|
||||
@ -584,8 +584,6 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
|
||||
goto out;
|
||||
}
|
||||
|
||||
memcpy(wl->nvs, fw->data, fw->size);
|
||||
|
||||
out:
|
||||
release_firmware(fw);
|
||||
|
||||
@ -2350,15 +2348,13 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
|
||||
goto err_hw_alloc;
|
||||
}
|
||||
|
||||
plat_dev = kmalloc(sizeof(wl1271_device), GFP_KERNEL);
|
||||
plat_dev = kmemdup(&wl1271_device, sizeof(wl1271_device), GFP_KERNEL);
|
||||
if (!plat_dev) {
|
||||
wl1271_error("could not allocate platform_device");
|
||||
ret = -ENOMEM;
|
||||
goto err_plat_alloc;
|
||||
}
|
||||
|
||||
memcpy(plat_dev, &wl1271_device, sizeof(wl1271_device));
|
||||
|
||||
wl = hw->priv;
|
||||
memset(wl, 0, sizeof(*wl));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user