From patchwork Mon Apr 25 23:08:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 8933351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AE1F19F441 for ; Mon, 25 Apr 2016 23:11:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E1BBB20125 for ; Mon, 25 Apr 2016 23:11:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EECAF2013A for ; Mon, 25 Apr 2016 23:11:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aupdJ-000386-8K; Mon, 25 Apr 2016 23:09:37 +0000 Received: from mail-oi0-x236.google.com ([2607:f8b0:4003:c06::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aupd0-0002pl-Co for linux-arm-kernel@lists.infradead.org; Mon, 25 Apr 2016 23:09:21 +0000 Received: by mail-oi0-x236.google.com with SMTP id r78so193519622oie.0 for ; Mon, 25 Apr 2016 16:08:58 -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; bh=IvSKIfEHJAA0Go9rlLjIR830E2oJo0RCef76hrmmuqA=; b=CrBMrbTQsfOGt3WlHOFpvy4UiZGlcughaZcjmXY5b6zKOX6/VR4wtLHPy5fK5WKcbm 8UXd8+eUXFWqgeGy6PmYs1c253yW9HaSuVULTZXEGmql8HpCINNzqgyEiMsynj03BD/Y eoVAKSLj6FXy90iMZx7UShWAew5F6cYzySWR0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IvSKIfEHJAA0Go9rlLjIR830E2oJo0RCef76hrmmuqA=; b=UChMIAxloG6AGcuaieRkHIH3736Q6ufhq5ZAqK5LH1lhT5rhiSLnPekB2drvISCEjy /R6etCfof0mOjvVjpNnZgt1e6nlltx/tF2ZZXzWjiHhqOe5+kBg1pFc3sNjSWqgEMDWQ Q/wgVR4kIO4R/24eh0D7n595olHIloFMmbzP1SS8HeWvOd93+/5nJylRH8oXiLVPKn5N gox9F4N2HZjcW64IGX76051B1zI6uo0jnLGZAbTwkQ8QhTgSaAMWi628kB/dTJC3SpTx GGG/EDrR5SKwnL3rE5A5atvuE5JNhjEV0dHRa+iWNC+Yue5wskRE0DwUysNRUiGkF6y3 wukw== X-Gm-Message-State: AOPr4FVMNRrEUKBeaDFHzcxoStApDuYfZ6Qmcfz4GAQoScwyRZ2ZmZv7oLx/sQOkbhBnEC2A X-Received: by 10.202.200.66 with SMTP id y63mr13614112oif.92.1461625737423; Mon, 25 Apr 2016 16:08:57 -0700 (PDT) Received: from localhost ([2602:306:c558:19b0:396f:541d:66bc:56f0]) by smtp.gmail.com with ESMTPSA id t92sm7119202otb.14.2016.04.25.16.08.56 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 25 Apr 2016 16:08:57 -0700 (PDT) From: Andy Gross To: linux-arm-msm@vger.kernel.org Subject: [Patch v2 3/8] firmware: qcom: scm: Generalize shared error map Date: Mon, 25 Apr 2016 18:08:40 -0500 Message-Id: <1461625725-32425-4-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461625725-32425-1-git-send-email-andy.gross@linaro.org> References: <1461625725-32425-1-git-send-email-andy.gross@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160425_160918_551159_8A351DCD X-CRM114-Status: GOOD ( 11.68 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Stephen Boyd , linux-kernel@vger.kernel.org, Andy Gross , Andy Gross , jilai wang , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch moves the qcom_scm_remap_error function to the include file where can be used by both the 32 and 64 bit versions of the code. Acked-by: Bjorn Andersson Signed-off-by: Andy Gross Signed-off-by: Andy Gross Reviewed-by: Stephen Boyd --- drivers/firmware/qcom_scm-32.c | 17 ----------------- drivers/firmware/qcom_scm.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c index 0883292..9e3dc2f 100644 --- a/drivers/firmware/qcom_scm-32.c +++ b/drivers/firmware/qcom_scm-32.c @@ -168,23 +168,6 @@ static inline void *qcom_scm_get_response_buffer(const struct qcom_scm_response return (void *)rsp + le32_to_cpu(rsp->buf_offset); } -static int qcom_scm_remap_error(int err) -{ - pr_err("qcom_scm_call failed with error code %d\n", err); - switch (err) { - case QCOM_SCM_ERROR: - return -EIO; - case QCOM_SCM_EINVAL_ADDR: - case QCOM_SCM_EINVAL_ARG: - return -EINVAL; - case QCOM_SCM_EOPNOTSUPP: - return -EOPNOTSUPP; - case QCOM_SCM_ENOMEM: - return -ENOMEM; - } - return -EINVAL; -} - static u32 smc(u32 cmd_addr) { int context_id; diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h index 2cce75c..7dcc733 100644 --- a/drivers/firmware/qcom_scm.h +++ b/drivers/firmware/qcom_scm.h @@ -44,4 +44,20 @@ extern int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, #define QCOM_SCM_ERROR -1 #define QCOM_SCM_INTERRUPTED 1 +static inline int qcom_scm_remap_error(int err) +{ + switch (err) { + case QCOM_SCM_ERROR: + return -EIO; + case QCOM_SCM_EINVAL_ADDR: + case QCOM_SCM_EINVAL_ARG: + return -EINVAL; + case QCOM_SCM_EOPNOTSUPP: + return -EOPNOTSUPP; + case QCOM_SCM_ENOMEM: + return -ENOMEM; + } + return -EINVAL; +} + #endif