From patchwork Fri Jun 18 11:15:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 12331113 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 52FFAC49EA3 for ; Fri, 18 Jun 2021 11:17:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 348E561248 for ; Fri, 18 Jun 2021 11:17:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231689AbhFRLTN (ORCPT ); Fri, 18 Jun 2021 07:19:13 -0400 Received: from mo4-p02-ob.smtp.rzone.de ([85.215.255.80]:24758 "EHLO mo4-p02-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231239AbhFRLTN (ORCPT ); Fri, 18 Jun 2021 07:19:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1624015021; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=TmiQ4yvqSb411vIWyt9OmjsSoyUm3e6fKITRv5hMjZ0=; b=TuF0zFzCVQBcn43eeOTknFqSjg/c81Y+v1CBUJLBznrVpcyWxhYHBfmfQaDrn4w7fn OSRAJIy4HAFgDKtgfxrrEVPkYrXtWjO6tSYahq0kvUPVPbUOH5peecOTyezdznS8ZaVd 4nXMJL5QbhCXUj6VYwLCGD5muyh+TtVIDr4nnFXYpmHE2C1g6JUiiYM3fK3jOM1BD4YX 7i1YeSxnT+c/YkTu8l3QQ4lBj6nAEl+PdcdFaDe8uveEHw0MzF73idyFt6/jXBR6/pcY +5oh5nZYNimV9hlJLpyHONgOfwEUu86f0l+FwjcTaFsWlnjnQY6Ys2EpVg+EgYkiuLDP Zqmg== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXS7IYBkLahKxA626EOg==" X-RZG-CLASS-ID: mo00 Received: from droid.. by smtp.strato.de (RZmta 47.27.3 DYNA|AUTH) with ESMTPSA id 000885x5IBH05MP (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 18 Jun 2021 13:17:00 +0200 (CEST) From: Stephan Gerhold To: Bjorn Andersson Cc: Andy Gross , Ohad Ben-Cohen , Mathieu Poirier , linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Stephan Gerhold Subject: [PATCH 3/3] remoteproc: qcom_wcnss: Use devm_qcom_smem_state_get() Date: Fri, 18 Jun 2021 13:15:56 +0200 Message-Id: <20210618111556.53416-3-stephan@gerhold.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618111556.53416-1-stephan@gerhold.net> References: <20210618111556.53416-1-stephan@gerhold.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use the new managed devm_qcom_smem_state_get() variant instead of calling qcom_smem_state_put() explicitly in remove() to simplify the code a bit. Signed-off-by: Stephan Gerhold --- drivers/remoteproc/qcom_wcnss.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index 5f3455aa7e0e..f1cbc6b2edbb 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -624,8 +624,8 @@ static int wcnss_probe(struct platform_device *pdev) wcnss->stop_ack_irq = ret; if (wcnss->stop_ack_irq) { - wcnss->state = qcom_smem_state_get(&pdev->dev, "stop", - &wcnss->stop_bit); + wcnss->state = devm_qcom_smem_state_get(&pdev->dev, "stop", + &wcnss->stop_bit); if (IS_ERR(wcnss->state)) { ret = PTR_ERR(wcnss->state); goto detach_pds; @@ -659,7 +659,6 @@ static int wcnss_remove(struct platform_device *pdev) of_platform_depopulate(&pdev->dev); - qcom_smem_state_put(wcnss->state); rproc_del(wcnss->rproc); qcom_remove_sysmon_subdev(wcnss->sysmon);