From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bh-25.webhostbox.net ([208.91.199.152]:55534 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755524AbbKYCUi (ORCPT ); Tue, 24 Nov 2015 21:20:38 -0500 Subject: Re: [PATCH v2 2/2] watchdog: core: factorize register error paths To: Damien Riegel , linux-watchdog@vger.kernel.org References: <1448408745-26719-1-git-send-email-damien.riegel@savoirfairelinux.com> <1448408745-26719-2-git-send-email-damien.riegel@savoirfairelinux.com> Cc: Wim Van Sebroeck , kernel@savoirfairelinux.com From: Guenter Roeck Message-ID: <56551AF3.5000703@roeck-us.net> Date: Tue, 24 Nov 2015 18:20:35 -0800 MIME-Version: 1.0 In-Reply-To: <1448408745-26719-2-git-send-email-damien.riegel@savoirfairelinux.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On 11/24/2015 03:45 PM, Damien Riegel wrote: > The commit adding the reboot notifier in the core introduced a new error > path in __watchdog_register_device, making error paths quite redundant. > > This commit factorizes all error paths that do some cleanup. > > Signed-off-by: Damien Riegel Reviewed-by: Guenter Roeck > --- > drivers/watchdog/watchdog_core.c | 26 ++++++++++++++------------ > 1 file changed, 14 insertions(+), 12 deletions(-) > > diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c > index e70b6e8..3d17c1c1 100644 > --- a/drivers/watchdog/watchdog_core.c > +++ b/drivers/watchdog/watchdog_core.c > @@ -241,20 +241,16 @@ static int __watchdog_register_device(struct watchdog_device *wdd) > wdd->id = id; > > ret = watchdog_dev_register(wdd); > - if (ret) { > - ida_simple_remove(&watchdog_ida, id); > - return ret; > - } > + if (ret) > + goto remove_ida; > } > > devno = wdd->cdev.dev; > wdd->dev = device_create(watchdog_class, wdd->parent, devno, > wdd, "watchdog%d", wdd->id); > if (IS_ERR(wdd->dev)) { > - watchdog_dev_unregister(wdd); > - ida_simple_remove(&watchdog_ida, id); > ret = PTR_ERR(wdd->dev); > - return ret; > + goto unregister_device; > } > > if (test_bit(WDOG_STOP_ON_REBOOT, &wdd->status)) { > @@ -264,11 +260,7 @@ static int __watchdog_register_device(struct watchdog_device *wdd) > if (ret) { > dev_err(wdd->dev, "Cannot register reboot notifier (%d)\n", > ret); > - device_destroy(watchdog_class, devno); > - watchdog_dev_unregister(wdd); > - ida_simple_remove(&watchdog_ida, wdd->id); > - wdd->dev = NULL; > - return ret; > + goto destroy_device; > } > } > > @@ -282,6 +274,16 @@ static int __watchdog_register_device(struct watchdog_device *wdd) > } > > return 0; > + > +destroy_device: > + device_destroy(watchdog_class, devno); > +unregister_device: > + watchdog_dev_unregister(wdd); > + wdd->dev = NULL; > +remove_ida: > + ida_simple_remove(&watchdog_ida, id); > + > + return ret; > } > > /** >