linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ipmi: remve duplicate code in __ipmi_bmc_register()
@ 2020-07-20  8:08 Jing Xiangfeng
  2020-07-20 11:32 ` Corey Minyard
  0 siblings, 1 reply; 2+ messages in thread
From: Jing Xiangfeng @ 2020-07-20  8:08 UTC (permalink / raw)
  To: minyard, arnd, gregkh, cminyard
  Cc: openipmi-developer, linux-kernel, jingxiangfeng

__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 <jingxiangfeng@huawei.com>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ipmi: remve duplicate code in __ipmi_bmc_register()
  2020-07-20  8:08 [PATCH] ipmi: remve duplicate code in __ipmi_bmc_register() Jing Xiangfeng
@ 2020-07-20 11:32 ` Corey Minyard
  0 siblings, 0 replies; 2+ messages in thread
From: Corey Minyard @ 2020-07-20 11:32 UTC (permalink / raw)
  To: Jing Xiangfeng; +Cc: minyard, arnd, gregkh, openipmi-developer, linux-kernel

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 <jingxiangfeng@huawei.com>
> ---
>  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
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-07-20 11:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20  8:08 [PATCH] ipmi: remve duplicate code in __ipmi_bmc_register() Jing Xiangfeng
2020-07-20 11:32 ` Corey Minyard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).