From patchwork Mon Apr 20 23:15:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11500071 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 463C66CA for ; Mon, 20 Apr 2020 23:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E43122202 for ; Mon, 20 Apr 2020 23:16:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Blmo1t2h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727007AbgDTXQF (ORCPT ); Mon, 20 Apr 2020 19:16:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726089AbgDTXQE (ORCPT ); Mon, 20 Apr 2020 19:16:04 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD0ABC061A0F for ; Mon, 20 Apr 2020 16:16:04 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id h11so4523436plr.11 for ; Mon, 20 Apr 2020 16:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NTEL7VXRuB9x3J7iFIoyLEPVb//XmBZtBUO3PJZONRE=; b=Blmo1t2hNA5Nhl8IZ6xC6kLN7I+lNYYXK0HfbLRhutS5ju4VODLBg0UBXqvwCqX+qk pog+se1krB7PNztpQiESXBRCogbWO0NNGRWLsxxJvrLf33lYfVw6W9ERJaOIL4fah1md B3OHfkrX8m/AeD6MfDWpheDC335+pDKdx0NdbPnvHESilF86+NimM1sMe0GQoHrp+blg JwIoMAVJtoykdRTYkJQO/orU9cSZOoxmHUxbt/aGIyiPX8MqXjIhrwg9Zt7CZK6BRaQH S2V7lCYD+RouKjUyWyosTcXPI4IiOjcUJpVF/GjNecvg5j0dcYYv0n14ey5PsruVJnCY 6TFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NTEL7VXRuB9x3J7iFIoyLEPVb//XmBZtBUO3PJZONRE=; b=WS/7ZKlPjDX6w6s4bFzUtYxDrE2yE5jLmNLc9GYhyt8W5d1tzkM0VUFFmlleqq3i3g SnMrpySQr+4+Qx5WabxnjbfdLXyDYZ2GwumRlmZou+ohVbStul9h6c0KN4Ttkp/T1i90 w9aMrbeHrVeBL/vjnDpP7FD2vhnu1cWOB4Qf5p4d3JvCruV+z2MBT+Z5FYLWyMkiC4cA 8s6NWwS430PVZVh71LxX9IJ1gRiaGQL2STcuSVHCs5OiPiy6jVmZA0h1IYwnYEIRiWzJ kDkJY9lkeZS3y2jp2iSKvD2nSgxoayX7b7LRV0XqqXODObOSUkxCfVebRrPuIENHW2Qq W+JQ== X-Gm-Message-State: AGi0PuakgoAGr5yklqbh73jkc1L7kGTb4f2ryOOfirlFUrnj/LWDzF+G nY+8OuBKeI+4RJ5dAMSKVGIb4w== X-Google-Smtp-Source: APiQypKTEDjpn7IQlVgv8ilHeqpZZwQjxIX0T8CCeJO73IN9hTAqrePdijKOsMIjIyyMhF9c9n6dkg== X-Received: by 2002:a17:902:d303:: with SMTP id b3mr3324441plc.12.1587424564335; Mon, 20 Apr 2020 16:16:04 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id l15sm435354pgk.59.2020.04.20.16.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 16:16:03 -0700 (PDT) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: elder@linaro.org, s-anna@ti.com, Markus.Elfring@web.de, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/4] remoteproc: Use kstrdup_const() rather than kstrdup() Date: Mon, 20 Apr 2020 17:15:58 -0600 Message-Id: <20200420231601.16781-2-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200420231601.16781-1-mathieu.poirier@linaro.org> References: <20200420231601.16781-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org For cases where @firmware is declared "const char *", use function kstrdup_const() to avoid needlessly creating another copy on the heap. Suggested-by: Bjorn Andersson Signed-off-by: Mathieu Poirier Reviewed-by: Alex Elder Reviewed-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 8 ++++---- include/linux/remoteproc.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index d9e6949e4ac1..db8a15fc1e4a 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1996,7 +1996,7 @@ static void rproc_type_release(struct device *dev) if (rproc->index >= 0) ida_simple_remove(&rproc_dev_index, rproc->index); - kfree(rproc->firmware); + kfree_const(rproc->firmware); kfree(rproc->ops); kfree(rproc); } @@ -2009,7 +2009,7 @@ static const struct device_type rproc_type = { static int rproc_alloc_firmware(struct rproc *rproc, const char *name, const char *firmware) { - char *p; + const char *p; if (!firmware) /* @@ -2018,7 +2018,7 @@ static int rproc_alloc_firmware(struct rproc *rproc, */ p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name); else - p = kstrdup(firmware, GFP_KERNEL); + p = kstrdup_const(firmware, GFP_KERNEL); if (!p) return -ENOMEM; @@ -2122,7 +2122,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, return rproc; free_firmware: - kfree(rproc->firmware); + kfree_const(rproc->firmware); free_rproc: kfree(rproc); return NULL; diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 0547676479d3..800b4f09dc98 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -489,7 +489,7 @@ struct rproc { struct list_head node; struct iommu_domain *domain; const char *name; - char *firmware; + const char *firmware; void *priv; struct rproc_ops *ops; struct device dev; From patchwork Mon Apr 20 23:15:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11500069 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0826B1575 for ; Mon, 20 Apr 2020 23:16:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2FD820B1F for ; Mon, 20 Apr 2020 23:16:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IG13ZSrT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727787AbgDTXQS (ORCPT ); Mon, 20 Apr 2020 19:16:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727050AbgDTXQF (ORCPT ); Mon, 20 Apr 2020 19:16:05 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2B40C061A0E for ; Mon, 20 Apr 2020 16:16:05 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id g6so5839037pgs.9 for ; Mon, 20 Apr 2020 16:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KASPutP8+Wt/2CivAD5BVxDPcY0aTKQ2tUjRHF1fuqg=; b=IG13ZSrTS4xSdhY/QebJdMqrM/vT/5xW3to2DDrjBlMngXoczlq2XfhiQFBBCmotlF Gyu7pZbJejO+Jr8yqmUwxTBj0EG6HOEU7mHsGotvbNYroOHdXzZt3dIEabZS6mjMDhdt gUEL/Ek5qwWEoMwrV8rE3GuVb04skEngiDYAvdUg39+Lbxy2Z9A6lXkyHCmyZEdk7Fuo aum/OwPdMFsI8TD/TnqdhJBdvrgRHZc+zHhSWI1MVb8k0M49nOC3ZgMmc4cRvXNVYEeZ I6P8ZfkyIe+PaEQy3rMf92IvgclRCaaaTtAxHGNDmbCAE4XwrxfG1SMqlsO/nI/yKZQG in9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KASPutP8+Wt/2CivAD5BVxDPcY0aTKQ2tUjRHF1fuqg=; b=SWOsSNxcdXgibOOk2zMWZsrNXMUwCN5jLTw5KHAR5v7D7o/L+ogq8GfGoAq3ECYPkt lvslyleYjt+Ex72Y+Nk5p2Ge++6O4ahj8yZTCUGaeToJWtCN3L3SmLfCu/YRLFU6+2ur C5X97dgVnBwdkkqryw1I3XYQeA9GBlJd2s0hPi/DuMy/3Q2gaXbf6dWC/ja8kPGEEUFI uizRIrRdT5z/iMd84Mb6NJimJz0qGY/etKWjbyM/X+3vuzQoBP+ypkNldhsm2+PXpkGh WgQPSMRGZDRD8rspWTyFD6czYiORs1dbi4gHyF62f0yNwHwHTV1wIGmCIgwiLfMWSlkH ZKtw== X-Gm-Message-State: AGi0Pub76aEPHDqunzQiUcFfkMUhjlL8m2XVIArW9UjQ9j2xGAVViqq6 p4XVv4yGxsHSw1GWnYgMttMclA== X-Google-Smtp-Source: APiQypJqbaUChBQV737Tz6wMqMVNrF6DfwFKPYnIC0lHRs1zJCJKHciybyFNgByZKuGHiZgmUHPmMg== X-Received: by 2002:a62:ea06:: with SMTP id t6mr19109437pfh.298.1587424565358; Mon, 20 Apr 2020 16:16:05 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id l15sm435354pgk.59.2020.04.20.16.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 16:16:04 -0700 (PDT) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: elder@linaro.org, s-anna@ti.com, Markus.Elfring@web.de, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/4] remoteproc: Restructure firmware name allocation Date: Mon, 20 Apr 2020 17:15:59 -0600 Message-Id: <20200420231601.16781-3-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200420231601.16781-1-mathieu.poirier@linaro.org> References: <20200420231601.16781-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Improve the readability of function rproc_alloc_firmware() by using a non-negated condition and moving the comment out of the conditional block Suggested-by: Alex Elder Signed-off-by: Mathieu Poirier Reviewed-by: Alex Elder Reviewed-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index db8a15fc1e4a..45529d40342f 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2011,14 +2011,14 @@ static int rproc_alloc_firmware(struct rproc *rproc, { const char *p; - if (!firmware) - /* - * If the caller didn't pass in a firmware name then - * construct a default name. - */ - p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name); - else + /* + * Allocate a firmware name if the caller gave us one to work + * with. Otherwise construct a new one using a default pattern. + */ + if (firmware) p = kstrdup_const(firmware, GFP_KERNEL); + else + p = kasprintf(GFP_KERNEL, "rproc-%s-fw", name); if (!p) return -ENOMEM; From patchwork Mon Apr 20 23:16:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11500067 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A29E814DD for ; Mon, 20 Apr 2020 23:16:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A4AA20B1F for ; Mon, 20 Apr 2020 23:16:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b7QPcnci" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727082AbgDTXQR (ORCPT ); Mon, 20 Apr 2020 19:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728057AbgDTXQH (ORCPT ); Mon, 20 Apr 2020 19:16:07 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C70E1C061A0E for ; Mon, 20 Apr 2020 16:16:06 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id y6so63653pjc.4 for ; Mon, 20 Apr 2020 16:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dza4hzfaFmzh3Frpav4RG02VUoiCOrQpepiedtPNL7c=; b=b7QPcncixOowdwF513j6U8tfP77Wo0PggKWFrKwbYZ+AZhIlNRMWMxvbjH9NTix8d1 VgiSGYX7jCL7iQwB41rdDoysn8OpMSMMyb6H8kY81Nc37HlxDcKr1vdq8xjk7FYtrvvg NuClw43cR1SWUI3OhxNfgvAsoOaTNpcyU4JgbNdqZHAv181LAnFojOMsJpELoNsJtS8d RW3sJ/qE0LQk4MbOd0vPS/55LrXM8oE34jhqJEMkiI8QN2pncle4A3hId46+R22aqFmm qVLDzhdjfnMK8pq4h7HNLmUjdfovJjMcSfTVmxwAYMLvJTePO9TvZtj5ZJmJlHWxijke pAYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dza4hzfaFmzh3Frpav4RG02VUoiCOrQpepiedtPNL7c=; b=bWVUzuwmfsNBqoYf/x1Dl9B4JYl5IWnetQ612FeFRzy9muyrhGqsTdwgd94sNxL31w 9sfqnx4XQlWcglA3Sz6G0MZFcBudvJSPcrpl7/m4LMqNFeaXZEHyYZQYI5Md7bnolcyJ sW5yhrPWmX1cNckBWobLJIFvYeYXsGq4bEHU+aKPN2ds4N7qapnbnMynlj+9KhIwFsnj bgcsEhfUbpApMvrF3iUF522gBjTCdtNBAuhfCtNjD89e0kqBLqW03s8v9Tl2QH/5NGCn thqXqAIC72CfplS1xlDqgurWhJeM3twBlq1pCHOja9M53+yw/HoQRldOdz3X+itgt+0T iwGQ== X-Gm-Message-State: AGi0PuYmsA13NLxk3Wh5GrecdRxHW56d8Bdjx8AXweuO2RxGRTKvXqyo hlTT/rqn+yencZUTJgjFR/jqhQ== X-Google-Smtp-Source: APiQypKzxNRdPzrHdiqjIdsTokoS2NTxm85nq87jtVQxHeiZu7I1gt5bgqxgTT5C4qCWWE8/gbk5dQ== X-Received: by 2002:a17:902:b108:: with SMTP id q8mr19688672plr.214.1587424566380; Mon, 20 Apr 2020 16:16:06 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id l15sm435354pgk.59.2020.04.20.16.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 16:16:05 -0700 (PDT) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: elder@linaro.org, s-anna@ti.com, Markus.Elfring@web.de, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/4] remoteproc: Split rproc_ops allocation from rproc_alloc() Date: Mon, 20 Apr 2020 17:16:00 -0600 Message-Id: <20200420231601.16781-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200420231601.16781-1-mathieu.poirier@linaro.org> References: <20200420231601.16781-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Make the rproc_ops allocation a function on its own in an effort to clean up function rproc_alloc(). Signed-off-by: Mathieu Poirier Reviewed-by: Alex Elder Reviewed-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 45529d40342f..15318507aedb 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2028,6 +2028,26 @@ static int rproc_alloc_firmware(struct rproc *rproc, return 0; } +static int rproc_alloc_ops(struct rproc *rproc, const struct rproc_ops *ops) +{ + rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL); + if (!rproc->ops) + return -ENOMEM; + + if (rproc->ops->load) + return 0; + + /* Default to ELF loader if no load function is specified */ + rproc->ops->load = rproc_elf_load_segments; + rproc->ops->parse_fw = rproc_elf_load_rsc_table; + rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table; + if (!rproc->ops->sanity_check) + rproc->ops->sanity_check = rproc_elf32_sanity_check; + rproc->ops->get_boot_addr = rproc_elf_get_boot_addr; + + return 0; +} + /** * rproc_alloc() - allocate a remote processor handle * @dev: the underlying device @@ -2067,8 +2087,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, if (rproc_alloc_firmware(rproc, name, firmware)) goto free_rproc; - rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL); - if (!rproc->ops) + if (rproc_alloc_ops(rproc, ops)) goto free_firmware; rproc->name = name; @@ -2096,16 +2115,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, atomic_set(&rproc->power, 0); - /* Default to ELF loader if no load function is specified */ - if (!rproc->ops->load) { - rproc->ops->load = rproc_elf_load_segments; - rproc->ops->parse_fw = rproc_elf_load_rsc_table; - rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table; - if (!rproc->ops->sanity_check) - rproc->ops->sanity_check = rproc_elf32_sanity_check; - rproc->ops->get_boot_addr = rproc_elf_get_boot_addr; - } - mutex_init(&rproc->lock); INIT_LIST_HEAD(&rproc->carveouts); From patchwork Mon Apr 20 23:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11500065 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C29826CA for ; Mon, 20 Apr 2020 23:16:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB9D622202 for ; Mon, 20 Apr 2020 23:16:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="FK5ufNXV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728230AbgDTXQJ (ORCPT ); Mon, 20 Apr 2020 19:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728145AbgDTXQJ (ORCPT ); Mon, 20 Apr 2020 19:16:09 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15987C061A0F for ; Mon, 20 Apr 2020 16:16:08 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id d24so4531098pll.8 for ; Mon, 20 Apr 2020 16:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IpsOJZL+ZU4RTGqMsf0NvSnMAMglq/aHlmJWyZVItPk=; b=FK5ufNXVpujVoE0t/Y/YeaigrOO4bjzfV53ejd/HM0R8r256r6kgoz3efJ3iulaXFe h12IwO+wVWpj2nTXVT0Z/Fr8Ia2SsPD9iffjIVsMOmlpPiWb93gEVminTjLby3cBV+vR hiUZnzk+/Wj/aTH8HYyrFDcbwo2lO7F4k4QH/a+SeazDRCH6G4vgsqzN++LfXqRn1AWN XpLqL/OVRIidsO7fVO5XCyXVvZysmiNrnl/D1AWIYpAd95ftDTnu2vOTsg5Unzi98aNY GFq80muzU/AW8pnqoC/sDtWgUMWem0TPHHfcbNVRbe0XkMiZG8R2KsQcXNHReODgGCtU g0/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IpsOJZL+ZU4RTGqMsf0NvSnMAMglq/aHlmJWyZVItPk=; b=t0AaxNxx/1yP9BzFlduA5vDkN5Nrytw5IjChgeKaZQasy+NDipFwpolWQwDuWC0t2N Gmo2oNCOaIEhmb5KkWsim9TvNuuzeO3ItfLCdGZ3J74mCFG5AFMCHAXnPlJrDQy1d6zv wBWTuDOn2TRDf8mX5i77gPkD2S3ZT7KxEG1NxTjJm/YGFNSwanCa9SmojymVTEGQssj5 1rpP23JfgKNPYqc5K1zVEr46M0RRbfkHizNPPlwSLBVspEvDRDROvLc0doplhtgUahB0 JYY3sMmvm4Nnxd6P41LHvNXqR07uHyUHhxu7qSW9sIYkQtQdbQukFRfVuuwxiET1NNFE cV3g== X-Gm-Message-State: AGi0Pubdk2DPd4V35KaxZDRlTJWE/PtSNYBgzlb0FeM0gVHERbJ4h6Tm gmbsTT+Oe0SV8eSir3nS9DJmXQ== X-Google-Smtp-Source: APiQypJdQApqSjhbDtcAZmALy8nxBP+m5Mq2RV1NphXt2SqGc3jSLBDsS/GWxBgJ99jQ4RpPdzal6g== X-Received: by 2002:a17:90a:e7cf:: with SMTP id kb15mr2128820pjb.146.1587424567620; Mon, 20 Apr 2020 16:16:07 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id l15sm435354pgk.59.2020.04.20.16.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 16:16:07 -0700 (PDT) From: Mathieu Poirier To: bjorn.andersson@linaro.org, ohad@wizery.com Cc: elder@linaro.org, s-anna@ti.com, Markus.Elfring@web.de, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/4] remoteproc: Get rid of tedious error path Date: Mon, 20 Apr 2020 17:16:01 -0600 Message-Id: <20200420231601.16781-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200420231601.16781-1-mathieu.poirier@linaro.org> References: <20200420231601.16781-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Get rid of tedious error management by moving firmware and operation allocation after calling device_initialize(). That way we take advantage of the automatic call to rproc_type_release() to cleanup after ourselves when put_device() is called. Signed-off-by: Mathieu Poirier Reviewed-by: Alex Elder Acked-by: Suman Anna Reviewed-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 15318507aedb..6fca4e2c0dd7 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2084,12 +2084,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, if (!rproc) return NULL; - if (rproc_alloc_firmware(rproc, name, firmware)) - goto free_rproc; - - if (rproc_alloc_ops(rproc, ops)) - goto free_firmware; - rproc->name = name; rproc->priv = &rproc[1]; rproc->auto_boot = true; @@ -2103,12 +2097,17 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, rproc->dev.driver_data = rproc; idr_init(&rproc->notifyids); + if (rproc_alloc_firmware(rproc, name, firmware)) + goto put_device; + + if (rproc_alloc_ops(rproc, ops)) + goto put_device; + /* Assign a unique device index and name */ rproc->index = ida_simple_get(&rproc_dev_index, 0, 0, GFP_KERNEL); if (rproc->index < 0) { dev_err(dev, "ida_simple_get failed: %d\n", rproc->index); - put_device(&rproc->dev); - return NULL; + goto put_device; } dev_set_name(&rproc->dev, "remoteproc%d", rproc->index); @@ -2130,10 +2129,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, return rproc; -free_firmware: - kfree_const(rproc->firmware); -free_rproc: - kfree(rproc); +put_device: + put_device(&rproc->dev); return NULL; } EXPORT_SYMBOL(rproc_alloc);