mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
[PATCH] kmemdup() cleanup in drivers/net
hi, replace open coded kmemdup() to save some screen space, and allow inlining/not inlining to be triggered by gcc. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
bf793295e1
commit
c3a9392e4f
2 changed files with 2 additions and 5 deletions
|
@ -1906,9 +1906,7 @@ static void __init de21041_get_srom_info (struct de_private *de)
|
||||||
de->media[i].csr15 = t21041_csr15[i];
|
de->media[i].csr15 = t21041_csr15[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
de->ee_data = kmalloc(DE_EEPROM_SIZE, GFP_KERNEL);
|
de->ee_data = kmemdup(&ee_data[0], DE_EEPROM_SIZE, GFP_KERNEL);
|
||||||
if (de->ee_data)
|
|
||||||
memcpy(de->ee_data, &ee_data[0], DE_EEPROM_SIZE);
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -7568,11 +7568,10 @@ static int ipw2100_wx_set_genie(struct net_device *dev,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (wrqu->data.length) {
|
if (wrqu->data.length) {
|
||||||
buf = kmalloc(wrqu->data.length, GFP_KERNEL);
|
buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
memcpy(buf, extra, wrqu->data.length);
|
|
||||||
kfree(ieee->wpa_ie);
|
kfree(ieee->wpa_ie);
|
||||||
ieee->wpa_ie = buf;
|
ieee->wpa_ie = buf;
|
||||||
ieee->wpa_ie_len = wrqu->data.length;
|
ieee->wpa_ie_len = wrqu->data.length;
|
||||||
|
|
Loading…
Reference in a new issue