From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752691AbbHLMUy (ORCPT ); Wed, 12 Aug 2015 08:20:54 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:40401 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752048AbbHLMUv (ORCPT ); Wed, 12 Aug 2015 08:20:51 -0400 From: Mark Brown To: Liam Girdwood Cc: linux-kernel@vger.kernel.org, Mark Brown Date: Wed, 12 Aug 2015 13:20:42 +0100 Message-Id: <1439382043-24857-2-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439382043-24857-1-git-send-email-broonie@kernel.org> References: <1439382043-24857-1-git-send-email-broonie@kernel.org> X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: [PATCH 2/3] regulator: core: Move more deallocation into class unregister X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We really ought to be using the class dvice lifetime management features more than we are rather than open coding them so take a step towards that by moving some of the simplest deallocations to the dev_release() function. Signed-off-by: Mark Brown --- drivers/regulator/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 89be8e2..01a0a78 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3598,6 +3598,9 @@ static const struct attribute_group *regulator_dev_groups[] = { static void regulator_dev_release(struct device *dev) { struct regulator_dev *rdev = dev_get_drvdata(dev); + + kfree(rdev->constraints); + of_node_put(rdev->dev.of_node); kfree(rdev); } @@ -3829,9 +3832,7 @@ void regulator_unregister(struct regulator_dev *rdev) unset_regulator_supplies(rdev); list_del(&rdev->list); mutex_unlock(®ulator_list_mutex); - kfree(rdev->constraints); regulator_ena_gpio_free(rdev); - of_node_put(rdev->dev.of_node); device_unregister(&rdev->dev); } EXPORT_SYMBOL_GPL(regulator_unregister); -- 2.5.0