platform/x86: Use kmemdup rather than duplicating its implementation
PATCH 19/30 platform/x86: Use kmemdup rather than duplicating its implementation
kmemdup is introduced to duplicate a region of memory in a neat way. Rather than kmalloc/kzalloc + memset, which the programmer needs to write the size twice (sometimes lead to mistakes), kmemdup improves readability, leads to smaller code and also reduce the chances of mistakes. Suggestion to use kmemdup rather than using kmalloc/kzalloc + memset.
--- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/thinkpad_acpi.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-)
drivers/platform/x86/asus-wmi.c +1 -2
@@ -260,12 +260,11 @@ static int asus_wmi_evaluate_method_agfn(const struct acpi_buffer args)* Copy to dma capable address otherwise memory corruption occurs as * bios has to be able to access it. */ - input.pointer =kzalloc (args.length,GFP_DMA |GFP_KERNEL ); + input.pointer =kmemdup (args.pointer, args.length,GFP_DMA |GFP_KERNEL ); input.length = args.length;if (!input.pointer)return -ENOMEM ; phys_addr =virt_to_phys (input.pointer); -memcpy (input.pointer, args.pointer, args.length); status =asus_wmi_evaluate_method (ASUS_WMI_METHODID_AGFN , phys_addr,0 , &retval);
drivers/platform/x86/thinkpad_acpi.c +7 -10
@@ -3647,22 +3647,19 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) goto err_exit;/* Set up key map */ - hotkey_keycode_map =kmalloc (TPACPI_HOTKEY_MAP_SIZE , -GFP_KERNEL ); -if (!hotkey_keycode_map) { -pr_err ("failed to allocate memory for key map\n" ); - res = -ENOMEM ; - goto err_exit; - } - keymap_id =tpacpi_check_quirks (tpacpi_keymap_qtable,ARRAY_SIZE (tpacpi_keymap_qtable));BUG_ON (keymap_id >=ARRAY_SIZE (tpacpi_keymaps));dbg_printk (TPACPI_DBG_INIT |TPACPI_DBG_HKEY ,"using keymap number %lu\n" , keymap_id); -memcpy (hotkey_keycode_map, &tpacpi_keymaps[keymap_id], -TPACPI_HOTKEY_MAP_SIZE ); + hotkey_keycode_map =kmemdup (&tpacpi_keymaps[keymap_id], +TPACPI_HOTKEY_MAP_SIZE ,GFP_KERNEL ); +if (!hotkey_keycode_map) { +pr_err ("failed to allocate memory for key map\n" ); + res = -ENOMEM ; + goto err_exit; + }input_set_capability (tpacpi_inputdev,EV_MSC ,MSC_SCAN ); tpacpi_inputdev->keycodesize =TPACPI_HOTKEY_MAP_TYPESIZE ;
Signature · 1 line
2.11.0
Quoted 7 lines · Fuqian Huang
kmemdup is introduced to duplicate a region of memory in a neat way. Rather than kmalloc/kzalloc + memset, which the programmer needs to write the size twice (sometimes lead to mistakes), kmemdup improves readability, leads to smaller code and also reduce the chances of mistakes. Suggestion to use kmemdup rather than using kmalloc/kzalloc + memset.
Please, split on driver basis and use correct prefix.
Quoted 61 lines
Signed-off-by Fuqian Huang <[email protected]>--- drivers/platform/x86/asus-wmi.c | 3 +-- drivers/platform/x86/thinkpad_acpi.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-)drivers/platform/x86/asus-wmi.c +1
-2@@ -260,12 +260,11 @@ static int asus_wmi_evaluate_method_agfn(const struct acpi_buffer args)* Copy to dma capable address otherwise memory corruption occurs as * bios has to be able to access it. */ - input.pointer =kzalloc (args.length,GFP_DMA |GFP_KERNEL ); + input.pointer =kmemdup (args.pointer, args.length,GFP_DMA |GFP_KERNEL ); input.length = args.length;if (!input.pointer)return -ENOMEM ; phys_addr =virt_to_phys (input.pointer); -memcpy (input.pointer, args.pointer, args.length); status =asus_wmi_evaluate_method (ASUS_WMI_METHODID_AGFN , phys_addr,0 , &retval);drivers/platform/x86/thinkpad_acpi.c +7
-11@@ -3647,22 +3647,19 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) goto err_exit;/* Set up key map */ - hotkey_keycode_map =kmalloc (TPACPI_HOTKEY_MAP_SIZE , -GFP_KERNEL ); -if (!hotkey_keycode_map) { -pr_err ("failed to allocate memory for key map\n" ); - res = -ENOMEM ; - goto err_exit; - } - keymap_id =tpacpi_check_quirks (tpacpi_keymap_qtable,ARRAY_SIZE (tpacpi_keymap_qtable));BUG_ON (keymap_id >=ARRAY_SIZE (tpacpi_keymaps));dbg_printk (TPACPI_DBG_INIT |TPACPI_DBG_HKEY ,"using keymap number %lu\n" , keymap_id); -memcpy (hotkey_keycode_map, &tpacpi_keymaps[keymap_id], -TPACPI_HOTKEY_MAP_SIZE ); + hotkey_keycode_map =kmemdup (&tpacpi_keymaps[keymap_id], +TPACPI_HOTKEY_MAP_SIZE ,GFP_KERNEL ); +if (!hotkey_keycode_map) { +pr_err ("failed to allocate memory for key map\n" ); + res = -ENOMEM ; + goto err_exit; + }input_set_capability (tpacpi_inputdev,EV_MSC ,MSC_SCAN ); tpacpi_inputdev->keycodesize =TPACPI_HOTKEY_MAP_TYPESIZE ; --2.11.0
Signature · 2 lines
With Best Regards, Andy Shevchenko