From patchwork Wed Jun 9 22:11:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russ Weight X-Patchwork-Id: 12311347 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BF8CC48BD1 for ; Wed, 9 Jun 2021 22:14:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DE7E61377 for ; Wed, 9 Jun 2021 22:14:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229705AbhFIWQq (ORCPT ); Wed, 9 Jun 2021 18:16:46 -0400 Received: from mga18.intel.com ([134.134.136.126]:22626 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229941AbhFIWQp (ORCPT ); Wed, 9 Jun 2021 18:16:45 -0400 IronPort-SDR: WwDG5hdqOvuu19Y2/z0HpMad40Dbd0Ug0rl0cagkZttsv42m0EozZlhWnPuUIbY+/AJCoYWHHk d1d+CkWBQZtw== X-IronPort-AV: E=McAfee;i="6200,9189,10010"; a="192496220" X-IronPort-AV: E=Sophos;i="5.83,261,1616482800"; d="scan'208";a="192496220" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 15:14:42 -0700 IronPort-SDR: cUXJ2l064KQs4AVlbFw1pIjzeGl5RlgkG1xFIAqzNwUfnbazNIjT2P6Yc3QKcmDzficNz2LC9p bBjiCeT6ZGyw== X-IronPort-AV: E=Sophos;i="5.83,261,1616482800"; d="scan'208";a="477095335" Received: from rhweight-mobl2.amr.corp.intel.com (HELO rhweight-mobl2.ra.intel.com) ([10.251.20.114]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 15:14:42 -0700 From: Russ Weight To: mdf@kernel.org, linux-fpga@vger.kernel.org Cc: trix@redhat.com, lgoncalv@redhat.com, yilun.xu@intel.com, hao.wu@intel.com, matthew.gerlach@intel.com, richard.gong@intel.com, Russ Weight Subject: [PATCH v2 6/8] fpga: mgr: Use standard dev_release for class driver Date: Wed, 9 Jun 2021 15:11:33 -0700 Message-Id: <20210609221135.261837-7-russell.h.weight@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210609221135.261837-1-russell.h.weight@intel.com> References: <20210609221135.261837-1-russell.h.weight@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org The FPGA manager class driver data structure is being treated as a managed resource instead of using the class.dev_release call-back function to release the class data structure. This change populates the class.dev_release function, changes the fpga_mgr_free() function to call put_device() and changes the fpga_mgr_unregister() function to call device_del() instead of device_unregister(). Signed-off-by: Russ Weight Reviewed-by: Xu Yilun --- v2: - Moved the renaming of "dev" to "parent" to a separate patch - Call fpga_mgr_free() in devm_fpga_mgr_release() instead of put_device() --- drivers/fpga/fpga-mgr.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 42ddc0844781..9f6c3760b6ff 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -585,8 +585,10 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name, return NULL; id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL); - if (id < 0) - goto error_kfree; + if (id < 0) { + kfree(mgr); + return NULL; + } mutex_init(&mgr->ref_mutex); @@ -602,17 +604,12 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name, mgr->dev.id = id; ret = dev_set_name(&mgr->dev, "fpga%d", id); - if (ret) - goto error_device; + if (ret) { + put_device(&mgr->dev); + return NULL; + } return mgr; - -error_device: - ida_simple_remove(&fpga_mgr_ida, id); -error_kfree: - kfree(mgr); - - return NULL; } EXPORT_SYMBOL_GPL(fpga_mgr_create); @@ -622,8 +619,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_create); */ void fpga_mgr_free(struct fpga_manager *mgr) { - ida_simple_remove(&fpga_mgr_ida, mgr->dev.id); - kfree(mgr); + put_device(&mgr->dev); } EXPORT_SYMBOL_GPL(fpga_mgr_free); @@ -692,16 +688,11 @@ int fpga_mgr_register(struct fpga_manager *mgr) ret = device_add(&mgr->dev); if (ret) - goto error_device; + return ret; dev_info(&mgr->dev, "%s registered\n", mgr->name); return 0; - -error_device: - ida_simple_remove(&fpga_mgr_ida, mgr->dev.id); - - return ret; } EXPORT_SYMBOL_GPL(fpga_mgr_register); @@ -722,7 +713,7 @@ void fpga_mgr_unregister(struct fpga_manager *mgr) if (mgr->mops->fpga_remove) mgr->mops->fpga_remove(mgr); - device_unregister(&mgr->dev); + device_del(&mgr->dev); } EXPORT_SYMBOL_GPL(fpga_mgr_unregister); @@ -781,6 +772,10 @@ EXPORT_SYMBOL_GPL(devm_fpga_mgr_register); static void fpga_mgr_dev_release(struct device *dev) { + struct fpga_manager *mgr = to_fpga_manager(dev); + + ida_simple_remove(&fpga_mgr_ida, mgr->dev.id); + kfree(mgr); } static int __init fpga_mgr_class_init(void)