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);