2020-07-20 08:07:21

by Jing Xiangfeng

Subject: [PATCH] ipmi: remve duplicate code in __ipmi_bmc_register()

__ipmi_bmc_register() jumps to the label 'out_free_my_dev_name' in an
error path. So we can remove duplicate code in the if (rv).

Signed-off-by: Jing Xiangfeng <[email protected]>
---
drivers/char/ipmi/ipmi_msghandler.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index e1b22fe0916c..737c0b6b24ea 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -3080,8 +3080,6 @@ static int __ipmi_bmc_register(struct ipmi_smi *intf,
rv = sysfs_create_link(&bmc->pdev.dev.kobj, &intf->si_dev->kobj,
intf->my_dev_name);
if (rv) {
- kfree(intf->my_dev_name);
- intf->my_dev_name = NULL;
dev_err(intf->si_dev, "Unable to create symlink to bmc: %d\n",
rv);
goto out_free_my_dev_name;
--
2.17.1

2020-07-20 11:35:15

by Corey Minyard

Subject: Re: [PATCH] ipmi: remve duplicate code in __ipmi_bmc_register()

On Mon, Jul 20, 2020 at 04:08:38PM +0800, Jing Xiangfeng wrote:
> __ipmi_bmc_register() jumps to the label 'out_free_my_dev_name' in an
> error path. So we can remove duplicate code in the if (rv).

Looks correct, queued for next release.

Thanks,

-corey

>
> Signed-off-by: Jing Xiangfeng <[email protected]>
> ---
> drivers/char/ipmi/ipmi_msghandler.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
> index e1b22fe0916c..737c0b6b24ea 100644
> --- a/drivers/char/ipmi/ipmi_msghandler.c
> +++ b/drivers/char/ipmi/ipmi_msghandler.c
> @@ -3080,8 +3080,6 @@ static int __ipmi_bmc_register(struct ipmi_smi *intf,
> rv = sysfs_create_link(&bmc->pdev.dev.kobj, &intf->si_dev->kobj,
> intf->my_dev_name);
> if (rv) {
> - kfree(intf->my_dev_name);
> - intf->my_dev_name = NULL;
> dev_err(intf->si_dev, "Unable to create symlink to bmc: %d\n",
> rv);
> goto out_free_my_dev_name;
> --
> 2.17.1
>