From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761240AbaJDAO7 (ORCPT ); Fri, 3 Oct 2014 20:14:59 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:38922 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755313AbaJCVpP (ORCPT ); Fri, 3 Oct 2014 17:45:15 -0400 From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org, dmitry.torokhov@gmail.com, tiwai@suse.de, tj@kernel.org, arjan@linux.intel.com Cc: teg@jklm.no, rmilasan@suse.com, werner@suse.com, oleg@redhat.com, hare@suse.com, bpoirier@suse.de, santosh@chelsio.com, pmladek@suse.cz, dbueso@suse.com, mcgrof@suse.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] driver-core: generalize freeing driver private member Date: Fri, 3 Oct 2014 14:44:41 -0700 Message-Id: <1412372683-2003-6-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412372683-2003-1-git-send-email-mcgrof@do-not-panic.com> References: <1412372683-2003-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Luis R. Rodriguez" This will be used later. Cc: Tejun Heo Cc: Arjan van de Ven Cc: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org Signed-off-by: Luis R. Rodriguez --- drivers/base/bus.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 83e910a..a5f41e4 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -657,6 +657,15 @@ static ssize_t uevent_store(struct device_driver *drv, const char *buf, } static DRIVER_ATTR_WO(uevent); +static void remove_driver_private(struct device_driver *drv) +{ + struct driver_private *priv = drv->p; + + kobject_put(&priv->kobj); + kfree(priv); + drv->p = NULL; +} + /** * bus_add_driver - Add a driver to the bus. * @drv: driver. @@ -719,9 +728,7 @@ int bus_add_driver(struct device_driver *drv) return 0; out_unregister: - kobject_put(&priv->kobj); - kfree(drv->p); - drv->p = NULL; + remove_driver_private(drv); out_put_bus: bus_put(bus); return error; -- 2.1.1