Input: matrix-keymap - switch to using __free() cleanup facility
Subsystems (2)
Dmitry Torokhov
maintainerPATCH 1/1 Input: matrix-keymap - switch to using __free() cleanup facility
Use __free(kfree) cleanup facility in matrix_keypad_parse_keymap() to automatically free temporarily allocated memory.
Signed-off-by Dmitry Torokhov <[email protected]>
--- drivers/input/matrix-keymap.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
drivers/input/matrix-keymap.c +9 -16
@@ -73,10 +73,9 @@ static int matrix_keypad_parse_keymap(const char *propname,struct device *dev = input_dev->dev.parent;unsigned int row_shift =get_count_order (cols);unsigned int max_keys = rows << row_shift; -u32 *keys;int i;int size; -int retval; +int error;if (!propname) propname ="linux,keymap" ;
@@ -94,30 +93,24 @@ static int matrix_keypad_parse_keymap(const char *propname,return -EINVAL ; } - keys =kmalloc_array (size,sizeof (u32),GFP_KERNEL ); + u32 *keys __free(kfree) = kmalloc_array(size, sizeof(*keys), GFP_KERNEL);if (!keys)return -ENOMEM ; - retval =device_property_read_u32_array (dev, propname, keys, size); -if (retval) { + error =device_property_read_u32_array (dev, propname, keys, size); +if (error) {dev_err (dev,"failed to read %s property: %d\n" , - propname, retval); - goto out; + propname, error); +return error; }for (i =0 ; i < size; i++) {if (!matrix_keypad_map_key (input_dev, rows, cols, - row_shift, keys[i])) { - retval = -EINVAL ; - goto out; - } + row_shift, keys[i])) +return -EINVAL ; } - retval =0 ; - -out: -kfree (keys); -return retval; +return 0 ; }/**
Signature · 5 lines
2.46.0.295.g3b9ea8a38a-goog -- Dmitry
Hi,
Quoted 4 lines · Dmitry Torokhov
Use
__free(kfree)cleanup facility inmatrix_keypad_parse_keymap()to automatically free temporarily allocated memory.Signed-off-by Dmitry Torokhov <[email protected]>
Thanks, patch looks good to me:
Reviewed-by Hans de Goede <[email protected]>
Regards,
Hans
Quoted 59 lines
--- drivers/input/matrix-keymap.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)drivers/input/matrix-keymap.c +9
-16@@ -73,10 +73,9 @@ static int matrix_keypad_parse_keymap(const char *propname,struct device *dev = input_dev->dev.parent;unsigned int row_shift =get_count_order (cols);unsigned int max_keys = rows << row_shift; -u32 *keys;int i;int size; -int retval; +int error;if (!propname) propname ="linux,keymap" ;@@ -94,30 +93,24 @@ static int matrix_keypad_parse_keymap(const char *propname,return -EINVAL ; } - keys =kmalloc_array (size,sizeof (u32),GFP_KERNEL ); + u32 *keys __free(kfree) = kmalloc_array(size, sizeof(*keys), GFP_KERNEL);if (!keys)return -ENOMEM ; - retval =device_property_read_u32_array (dev, propname, keys, size); -if (retval) { + error =device_property_read_u32_array (dev, propname, keys, size); +if (error) {dev_err (dev,"failed to read %s property: %d\n" , - propname, retval); - goto out; + propname, error); +return error; }for (i =0 ; i < size; i++) {if (!matrix_keypad_map_key (input_dev, rows, cols, - row_shift, keys[i])) { - retval = -EINVAL ; - goto out; - } + row_shift, keys[i])) +return -EINVAL ; } - retval =0 ; - -out: -kfree (keys); -return retval; +return 0 ; }/**