From patchwork Wed May 5 20:45:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1474569 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.a=rsa-sha256 header.s=google header.b=XlnwquxT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fb7z06Q5Qz9sRf for ; Thu, 6 May 2021 06:46:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 818A882B54; Wed, 5 May 2021 22:46:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.b="XlnwquxT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6B1582B79; Wed, 5 May 2021 22:45:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 070AE82AFB for ; Wed, 5 May 2021 22:45:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@foundries.io Received: by mail-lj1-x234.google.com with SMTP id s25so4264105lji.0 for ; Wed, 05 May 2021 13:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundries.io; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LICZmyTNQ8qo9uYlmZPss4WzRWMHcjLfpWMYTYtFwxY=; b=XlnwquxTrtTKjyVz9dh/b/fKY2W71LN64MFT01ShN436bUyh67UfPn8rCNt0WrlPfo Yz6r8N0ImblueNXi31qm8agpFIGajKVTFYxjUfZ0/WYVLYL+vUsBEH3X2OLlAG+JEEST oPNsTdF7/fu8Zu84kRsMbuXQ5gm2k+pDp6rWZaI7mYKYIEqkLx9MvwVvD1J4VpPrKpHB x0elN0q64L9osguUpxbZyDlWlllV/BoW2b++XQUBZTUG1P6Xz7AtbkKhFeOOwMsiVEDR vK49q/UrhhNf9EK61DnWrjZ/CE8ZQLh2VTKIXt+qT7U4XEJU45U9xJqsn0lX4xCGV7YC YxYA== 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:mime-version :content-transfer-encoding; bh=LICZmyTNQ8qo9uYlmZPss4WzRWMHcjLfpWMYTYtFwxY=; b=FNN4Pw6qwYVBmtk0RSrK4MHh+XS/nj+Ea4JARLYwQNRuKk55DFauy7Rr75mZXIFv8N 2WkrMmyBxMvapIMDSnx0CzCzJjnDhiEMScO2iRu4j1Nv4gqLsSxH91it+UjSRFyU6Jt3 LYo7W8Wnt6FWp2bp30/ZlF4iBGfghqOA/7Yi+wrj/jokjQxuIiS74a8SLmisZI3CRRJ0 X5F0EDemMzUy0gYcCmmtlGrub7AXrZKZoBBkgdH3AOU3/KTf4XOYkE6FmOq0035wcaH5 sQAqPyfBPBxWwyHH3PtaGtCn8J9QPlmfL/83A2VYMrOR/ZBnAME6izt9tDzOugszPcd+ UMDA== X-Gm-Message-State: AOAM533R1M1RPG2tVRKZ7ZUojWubKsKiGbLrHx6vTT1KqJq8K23gGnH7 ybFFJ0BKuL/e6iTDltkOmC+M6QcyAUcXfw== X-Google-Smtp-Source: ABdhPJzFnCJZ2HK43ZOjTwOrqUp/nFSnqNkdGVgDru5A2/ZfLiM/zUR4CzTCAJNjQkUZVnPQzJaXPg== X-Received: by 2002:a2e:a585:: with SMTP id m5mr501629ljp.223.1620247556175; Wed, 05 May 2021 13:45:56 -0700 (PDT) Received: from localhost ([109.108.76.111]) by smtp.gmail.com with ESMTPSA id x30sm114846lfn.221.2021.05.05.13.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 13:45:55 -0700 (PDT) From: Igor Opaniuk X-Google-Original-From: Igor Opaniuk To: u-boot@lists.denx.de Cc: ricardo@foundries.io, mr.nuke.me@gmail.com, mike@foundries.io, Igor Opaniuk , Jon Hunter , Michal Simek , Patrick Delaunay , Simon Glass , Yann Gautier Subject: [PATCH v1] psci: rename psci_features function Date: Wed, 5 May 2021 23:45:51 +0300 Message-Id: <20210505204551.57975-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk s/psci_features/psci_features_req/g for the case when both ARCH_SUPPORT_PSCI=y and ARM_PSCI_FW=y, that leads to these compilation issues: drivers/firmware/psci.c:69:12: error: conflicting types for 'psci_features' 69 | static int psci_features(u32 psci_func_id) | ^~~~~~~~~~~~~ In file included from drivers/firmware/psci.c:23: ./arch/arm/include/asm/system.h:548:5: note: previous declaration of 'psci_features' was here 548 | s32 psci_features(u32 function_id, u32 psci_fid); | ^~~~~~~~~~~~~ Signed-off-by: Igor Opaniuk --- drivers/firmware/psci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index be57552aba..f1841a1835 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -66,7 +66,7 @@ unsigned long __efi_runtime invoke_psci_fn return res.a0; } -static int psci_features(u32 psci_func_id) +static int psci_features_req(u32 psci_func_id) { return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES, psci_func_id, 0, 0); @@ -85,7 +85,7 @@ static bool psci_is_system_reset2_supported(void) ver = psci_0_2_get_version(); if (PSCI_VERSION_MAJOR(ver) >= 1) { - ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2)); + ret = psci_features_req(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2)); if (ret != PSCI_RET_NOT_SUPPORTED) return true;