extcon: Switch to use kasprintf() instead of open coded
Switch to use kasprintf() instead of open coded variant. No functional change intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
parent
cff7499d7e
commit
69f75a4f8c
@ -1123,7 +1123,6 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
(unsigned long)atomic_inc_return(&edev_no));
|
||||
|
||||
if (edev->max_supported) {
|
||||
char buf[10];
|
||||
char *str;
|
||||
struct extcon_cable *cable;
|
||||
|
||||
@ -1137,9 +1136,7 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
for (index = 0; index < edev->max_supported; index++) {
|
||||
cable = &edev->cables[index];
|
||||
|
||||
snprintf(buf, 10, "cable.%d", index);
|
||||
str = kzalloc(strlen(buf) + 1,
|
||||
GFP_KERNEL);
|
||||
str = kasprintf(GFP_KERNEL, "cable.%d", index);
|
||||
if (!str) {
|
||||
for (index--; index >= 0; index--) {
|
||||
cable = &edev->cables[index];
|
||||
@ -1149,7 +1146,6 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
|
||||
goto err_alloc_cables;
|
||||
}
|
||||
strcpy(str, buf);
|
||||
|
||||
cable->edev = edev;
|
||||
cable->cable_index = index;
|
||||
@ -1172,7 +1168,6 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
}
|
||||
|
||||
if (edev->max_supported && edev->mutually_exclusive) {
|
||||
char buf[80];
|
||||
char *name;
|
||||
|
||||
/* Count the size of mutually_exclusive array */
|
||||
@ -1197,9 +1192,8 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
}
|
||||
|
||||
for (index = 0; edev->mutually_exclusive[index]; index++) {
|
||||
sprintf(buf, "0x%x", edev->mutually_exclusive[index]);
|
||||
name = kzalloc(strlen(buf) + 1,
|
||||
GFP_KERNEL);
|
||||
name = kasprintf(GFP_KERNEL, "0x%x",
|
||||
edev->mutually_exclusive[index]);
|
||||
if (!name) {
|
||||
for (index--; index >= 0; index--) {
|
||||
kfree(edev->d_attrs_muex[index].attr.
|
||||
@ -1210,7 +1204,6 @@ int extcon_dev_register(struct extcon_dev *edev)
|
||||
ret = -ENOMEM;
|
||||
goto err_muex;
|
||||
}
|
||||
strcpy(name, buf);
|
||||
sysfs_attr_init(&edev->d_attrs_muex[index].attr);
|
||||
edev->d_attrs_muex[index].attr.name = name;
|
||||
edev->d_attrs_muex[index].attr.mode = 0000;
|
||||
|
Loading…
Reference in New Issue
Block a user