From patchwork Fri Apr 22 22:17:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Gross X-Patchwork-Id: 66499 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp962321qge; Fri, 22 Apr 2016 15:17:57 -0700 (PDT) X-Received: by 10.66.136.235 with SMTP id qd11mr31399555pab.140.1461363477233; Fri, 22 Apr 2016 15:17:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si8985625pfx.223.2016.04.22.15.17.56; Fri, 22 Apr 2016 15:17:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753456AbcDVWRb (ORCPT + 29 others); Fri, 22 Apr 2016 18:17:31 -0400 Received: from mail-oi0-f54.google.com ([209.85.218.54]:34569 "EHLO mail-oi0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753376AbcDVWR2 (ORCPT ); Fri, 22 Apr 2016 18:17:28 -0400 Received: by mail-oi0-f54.google.com with SMTP id k142so129818677oib.1 for ; Fri, 22 Apr 2016 15:17:28 -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=ri/fEeS5x8EbM7XC3V4rIEeys2pkv9Why78wjo0PYEk=; b=RTkXD8QqNuRCkeGW6zaHLTxTwPQueNhOkmWIfn7i1Eqce9dtY1DtX2HOZY2H7ztQNG rkHWwXs49mGykAnpsVXGYrK+zujt8s7D59f06fyCNel6o0lEe+BU3uf16BEvOw44zMXn PhF/3ghTVpEHJI6eD25a70VHxq4AVwBXQyW6A= 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=ri/fEeS5x8EbM7XC3V4rIEeys2pkv9Why78wjo0PYEk=; b=OgtEIzd1dQW+flJAT2feeaQz37KqJjU9d7xz9mi/+qfDEzQiKRp9AUFiV/qY1fwhpM +Ql3aXt7vXiFYNlCB3HWDlPEN3lDw3Q5CSICLERjl+rQsP0/b1FfsAReYpQ93CZslV4A wjcl7owYfZCMeHkX4AVfk1Ez+/xkgXQaL6wD3waYCcidcIyBMjqnIAwftwzTPnb6PcE7 Gwxr2a/LckN9lfhjC3HZSbgH2P8ijircV6FCqTzxJmMFklALjNbsVPaAvek0GXPM+gep dHdA42eDrCdtu1YSdNjHIEG0uhxZTX+rgdh/vxSh/szN+NvERwgzlzjSg92eiYqkRAWr SoGg== X-Gm-Message-State: AOPr4FWL0cyGahYaShLnxuV8nzvBsMd0p+bqOqpsKVdmTcleZdzOL2ifBMHLYSZrsfLt6b3+ X-Received: by 10.157.51.71 with SMTP id u7mr10159293otd.74.1461363447669; Fri, 22 Apr 2016 15:17:27 -0700 (PDT) Received: from localhost ([2602:306:c558:19b0:a419:15a3:ad7f:f979]) by smtp.gmail.com with ESMTPSA id s45sm2646550ota.23.2016.04.22.15.17.27 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 22 Apr 2016 15:17:27 -0700 (PDT) From: Andy Gross To: linux-arm-msm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stephen Boyd , devicetree@vger.kernel.org, Bjorn Andersson , jilai wang , Andy Gross , Andy Gross Subject: [PATCH 3/8] firmware: qcom: scm: Generalize shared error map Date: Fri, 22 Apr 2016 17:17:07 -0500 Message-Id: <1461363432-5730-4-git-send-email-andy.gross@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461363432-5730-1-git-send-email-andy.gross@linaro.org> References: <1461363432-5730-1-git-send-email-andy.gross@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Andy Gross Signed-off-by: Andy Gross --- drivers/firmware/qcom_scm-32.c | 17 ----------------- drivers/firmware/qcom_scm.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) -- 1.9.1 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