GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 13:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

firmware: arm_scmi: improve exit paths and code readability

Browse source 
The existing code intends the good path to reduce the code which is so
uncommon. It's obvious to have more readable code with a goto used for
the error path. This patch adds more appropriate error paths and makes
code more readable. It also moves a error logging outside the scope of
locking.

Suggested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Sudeep Holla 2018-05-09 17:52:06 +01:00
parent 8f3397ccb6
commit ec42ac6d1e
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/firmware/arm_scmi/bus.c
View file

@ -125,13 +125,13 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol)
int id, retval; int id, retval;
struct scmi_device *scmi_dev; struct scmi_device *scmi_dev;
id = ida_simple_get(&scmi_bus_id, 1, 0, GFP_KERNEL);
if (id < 0)
return NULL;
scmi_dev = kzalloc(sizeof(*scmi_dev), GFP_KERNEL); scmi_dev = kzalloc(sizeof(*scmi_dev), GFP_KERNEL);
if (!scmi_dev) if (!scmi_dev)
goto no_mem; return NULL;
id = ida_simple_get(&scmi_bus_id, 1, 0, GFP_KERNEL);
if (id < 0)
goto free_mem;
scmi_dev->id = id; scmi_dev->id = id;
scmi_dev->protocol_id = protocol; scmi_dev->protocol_id = protocol;
@ -141,13 +141,15 @@ scmi_device_create(struct device_node *np, struct device *parent, int protocol)
dev_set_name(&scmi_dev->dev, "scmi_dev.%d", id); dev_set_name(&scmi_dev->dev, "scmi_dev.%d", id);
retval = device_register(&scmi_dev->dev); retval = device_register(&scmi_dev->dev);
if (!retval) if (retval)
return scmi_dev; goto put_dev;
return scmi_dev;
put_dev:
put_device(&scmi_dev->dev); put_device(&scmi_dev->dev);
kfree(scmi_dev);
no_mem:
ida_simple_remove(&scmi_bus_id, id); ida_simple_remove(&scmi_bus_id, id);
free_mem:
kfree(scmi_dev);
return NULL; return NULL;
} }
@ -171,9 +173,9 @@ int scmi_protocol_register(int protocol_id, scmi_prot_init_fn_t fn)
spin_lock(&protocol_lock); spin_lock(&protocol_lock);
ret = idr_alloc(&scmi_protocols, fn, protocol_id, protocol_id + 1, ret = idr_alloc(&scmi_protocols, fn, protocol_id, protocol_id + 1,
GFP_ATOMIC); GFP_ATOMIC);
spin_unlock(&protocol_lock);
if (ret != protocol_id) if (ret != protocol_id)
pr_err("unable to allocate SCMI idr slot, err %d\n", ret); pr_err("unable to allocate SCMI idr slot, err %d\n", ret);
spin_unlock(&protocol_lock);
return ret; return ret;
} }