From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 18 May 2021 18:26:03 -0400 Subject: [PATCH v2] psci: rename psci_features function In-Reply-To: <20210506143427.6572-1-igor.opaniuk@gmail.com> References: <20210506143427.6572-1-igor.opaniuk@gmail.com> Message-ID: <20210518222603.GS17669@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, May 06, 2021 at 05:34:27PM +0300, Igor Opaniuk wrote: > From: Igor Opaniuk > > s/psci_features/request_psci_features/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); > | ^~~~~~~~~~~~~ > > Tested-by: Alexandru Gagniuc > Reported-by: Alexandru Gagniuc > Fixes: b7135b034f ("psci: add features/reset2 support") > Signed-off-by: Igor Opaniuk Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: