[BATTERY] power_supply_leds: use kasprintf

Use kasprintf instead of kmalloc()-strcpy()-strcat().

Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Anton Vorontsov <cbou@mail.ru>

authored by Akinobu Mita and committed by Anton Vorontsov 4d24473c 25f12141

+7 -18
+7 -18
drivers/power/power_supply_leds.c
··· 10 * You may use this code as per GPL version 2 11 */ 12 13 #include <linux/power_supply.h> 14 15 #include "power_supply.h" ··· 49 { 50 int rc = 0; 51 52 - psy->charging_full_trig_name = kmalloc(strlen(psy->name) + 53 - sizeof("-charging-or-full"), GFP_KERNEL); 54 if (!psy->charging_full_trig_name) 55 goto charging_full_failed; 56 57 - psy->charging_trig_name = kmalloc(strlen(psy->name) + 58 - sizeof("-charging"), GFP_KERNEL); 59 if (!psy->charging_trig_name) 60 goto charging_failed; 61 62 - psy->full_trig_name = kmalloc(strlen(psy->name) + 63 - sizeof("-full"), GFP_KERNEL); 64 if (!psy->full_trig_name) 65 goto full_failed; 66 - 67 - strcpy(psy->charging_full_trig_name, psy->name); 68 - strcat(psy->charging_full_trig_name, "-charging-or-full"); 69 - strcpy(psy->charging_trig_name, psy->name); 70 - strcat(psy->charging_trig_name, "-charging"); 71 - strcpy(psy->full_trig_name, psy->name); 72 - strcat(psy->full_trig_name, "-full"); 73 74 led_trigger_register_simple(psy->charging_full_trig_name, 75 &psy->charging_full_trig); ··· 113 { 114 int rc = 0; 115 116 - psy->online_trig_name = kmalloc(strlen(psy->name) + sizeof("-online"), 117 - GFP_KERNEL); 118 if (!psy->online_trig_name) 119 goto online_failed; 120 - 121 - strcpy(psy->online_trig_name, psy->name); 122 - strcat(psy->online_trig_name, "-online"); 123 124 led_trigger_register_simple(psy->online_trig_name, &psy->online_trig); 125
··· 10 * You may use this code as per GPL version 2 11 */ 12 13 + #include <linux/kernel.h> 14 #include <linux/power_supply.h> 15 16 #include "power_supply.h" ··· 48 { 49 int rc = 0; 50 51 + psy->charging_full_trig_name = kasprintf(GFP_KERNEL, 52 + "%s-charging-or-full", psy->name); 53 if (!psy->charging_full_trig_name) 54 goto charging_full_failed; 55 56 + psy->charging_trig_name = kasprintf(GFP_KERNEL, 57 + "%s-charging", psy->name); 58 if (!psy->charging_trig_name) 59 goto charging_failed; 60 61 + psy->full_trig_name = kasprintf(GFP_KERNEL, "%s-full", psy->name); 62 if (!psy->full_trig_name) 63 goto full_failed; 64 65 led_trigger_register_simple(psy->charging_full_trig_name, 66 &psy->charging_full_trig); ··· 120 { 121 int rc = 0; 122 123 + psy->online_trig_name = kasprintf(GFP_KERNEL, "%s-online", psy->name); 124 if (!psy->online_trig_name) 125 goto online_failed; 126 127 led_trigger_register_simple(psy->online_trig_name, &psy->online_trig); 128