Commit d930eb4f authored by Conor Dooley's avatar Conor Dooley

firmware: microchip: use scope-based cleanup where possible

There's a bunch of structs created and freed every time the mailbox is
used. Move them to use the scope-based cleanup infrastructure to avoid
manually tearing them down. mpfs_auto_update_available() didn't free the
memory that it used (albeit it allocated exactly once during probe) so
that gets moved over too.
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent e277026b
...@@ -175,28 +175,17 @@ static enum fw_upload_err mpfs_auto_update_poll_complete(struct fw_upload *fw_up ...@@ -175,28 +175,17 @@ static enum fw_upload_err mpfs_auto_update_poll_complete(struct fw_upload *fw_up
static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader) static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader)
{ {
struct mpfs_auto_update_priv *priv = fw_uploader->dd_handle; struct mpfs_auto_update_priv *priv = fw_uploader->dd_handle;
struct mpfs_mss_response *response; u32 *response_msg __free(kfree) =
struct mpfs_mss_msg *message; kzalloc(AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), GFP_KERNEL);
u32 *response_msg; struct mpfs_mss_response *response __free(kfree) =
kzalloc(sizeof(struct mpfs_mss_response), GFP_KERNEL);
struct mpfs_mss_msg *message __free(kfree) =
kzalloc(sizeof(struct mpfs_mss_msg), GFP_KERNEL);
int ret; int ret;
response_msg = devm_kzalloc(priv->dev, AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), if (!response_msg || !response || !message)
GFP_KERNEL);
if (!response_msg)
return -ENOMEM; return -ENOMEM;
response = devm_kzalloc(priv->dev, sizeof(struct mpfs_mss_response), GFP_KERNEL);
if (!response) {
ret = -ENOMEM;
goto free_response_msg;
}
message = devm_kzalloc(priv->dev, sizeof(struct mpfs_mss_msg), GFP_KERNEL);
if (!message) {
ret = -ENOMEM;
goto free_response;
}
/* /*
* The system controller can verify that an image in the flash is valid. * The system controller can verify that an image in the flash is valid.
* Rather than duplicate the check in this driver, call the relevant * Rather than duplicate the check in this driver, call the relevant
...@@ -218,20 +207,12 @@ static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader) ...@@ -218,20 +207,12 @@ static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader)
ret = mpfs_blocking_transaction(priv->sys_controller, message); ret = mpfs_blocking_transaction(priv->sys_controller, message);
if (ret | response->resp_status) { if (ret | response->resp_status) {
dev_warn(priv->dev, "Verification of Upgrade Image failed!\n"); dev_warn(priv->dev, "Verification of Upgrade Image failed!\n");
ret = ret ? ret : -EBADMSG; return ret ? ret : -EBADMSG;
goto free_message;
} }
dev_info(priv->dev, "Verification of Upgrade Image passed!\n"); dev_info(priv->dev, "Verification of Upgrade Image passed!\n");
free_message: return 0;
devm_kfree(priv->dev, message);
free_response:
devm_kfree(priv->dev, response);
free_response_msg:
devm_kfree(priv->dev, response_msg);
return ret;
} }
static int mpfs_auto_update_set_image_address(struct mpfs_auto_update_priv *priv, static int mpfs_auto_update_set_image_address(struct mpfs_auto_update_priv *priv,
...@@ -406,23 +387,15 @@ static const struct fw_upload_ops mpfs_auto_update_ops = { ...@@ -406,23 +387,15 @@ static const struct fw_upload_ops mpfs_auto_update_ops = {
static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv) static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv)
{ {
struct mpfs_mss_response *response; u32 *response_msg __free(kfree) =
struct mpfs_mss_msg *message; kzalloc(AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), GFP_KERNEL);
u32 *response_msg; struct mpfs_mss_response *response __free(kfree) =
kzalloc(sizeof(struct mpfs_mss_response), GFP_KERNEL);
struct mpfs_mss_msg *message __free(kfree) =
kzalloc(sizeof(struct mpfs_mss_msg), GFP_KERNEL);
int ret; int ret;
response_msg = devm_kzalloc(priv->dev, if (!response_msg || !response || !message)
AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg),
GFP_KERNEL);
if (!response_msg)
return -ENOMEM;
response = devm_kzalloc(priv->dev, sizeof(struct mpfs_mss_response), GFP_KERNEL);
if (!response)
return -ENOMEM;
message = devm_kzalloc(priv->dev, sizeof(struct mpfs_mss_msg), GFP_KERNEL);
if (!message)
return -ENOMEM; return -ENOMEM;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment