From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.87]) by mx.groups.io with SMTP id smtpd.web10.2814.1680855926277556736 for ; Fri, 07 Apr 2023 01:25:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=dU0yI8pM; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.243.87, mailfrom: abner.chang@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FAwuXfZ5l5I5fBvaoKp1WZspsNGjbsnV1PNZciHSCwOLGTcS25UMhYuLrYcDFV6yuf5vay3FWHsHkPnEwgOx77AvDCQKmg6HhWkViePEDlBoVfF2XtD1P7ioOFsQbmyjjdUQHdMFG9qU+uKeRV8GdrWF/iidztTNpsCcr5WOzOHX4UALE1a2d79+oWoZazjCV31035npEJfo9taKE1jrNx3Mc+cN/hsAsiYMIAzIGfsrLnCm6mzNJcL//RlrAObcbALcexv7doueHACLPVm+tkxFOWUvdrm0CI8miqWf9wJRmpz++wow9LyEsbaVnxpmQDf8+WrOgo+xnWBv4t21LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ifED441gyEFO3AMZ1Acexcc9LzRZg8pX9Xrx3giWZrw=; b=lJ7XjY8ev3dRzGe/6BBXmJUCaG3gQRNDhFi/aCgwoEYIkLmZ3Goy0tVDHFPR4nRPcCRmfhjLJDvS6w+VE41+K/jVDyiq5udwrH8Gv8Ez51+/yCuYlGr+Ixu2cQDS6+wP+P6v/4LLGCfF5dv46F1KVPScYi8nsXq8i+ySQvQUiTtjtbXz8sjfmY6d9ZFhGUpnKVwYP0gfAF9reXiTrgmNvtdcftuT7Z9CtieSPdPCX2K2PVJ/uiI04QIj6kqn4hcJZasS01wifM1UmJ+6QzTJFS3LXqaZXxfhLxBooXzKc5A15R3TTcugMtxxaEiDgVQlAZVhe0t1FdY3Dy+vAhQ+Tg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ifED441gyEFO3AMZ1Acexcc9LzRZg8pX9Xrx3giWZrw=; b=dU0yI8pMEkuW58pnGN1Zmk8kSgm2sXgBW6+88vKrdSidU9bluriOsKvPzSqt33xJHNyIyLyqHkPDCElnFmoEUR9oBAosrnGgXXjFRWUq4GW9D5AkKcQxpCBhwBcSGDFFS3bQ6xTE1uQQxLDRRw02qWESa8XzGQgrfAO88OAH6IU= Received: from MN2PR12MB3966.namprd12.prod.outlook.com (2603:10b6:208:165::18) by SN7PR12MB7810.namprd12.prod.outlook.com (2603:10b6:806:34c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.35; Fri, 7 Apr 2023 08:25:21 +0000 Received: from MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::30f:bd83:40dd:8f1]) by MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::30f:bd83:40dd:8f1%3]) with mapi id 15.20.6277.030; Fri, 7 Apr 2023 08:25:18 +0000 From: "Chang, Abner" To: Rebecca Cran , "devel@edk2.groups.io" , Liming Gao , Michael D Kinney , Guomin Jiang , Wei6 Xu , Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo , Andrew Fish , Hao A Wu , Maciej Rabeda , Siyuan Fu , Jiewen Yao , Jian J Wang , Xiaoyu Lu , Ard Biesheuvel , Sami Mujawar , Supreeth Venkatesh , Michael Kubacki , Nate DeSimone , Sean Brogan CC: Leif Lindholm , Nickle Wang , Igor Kulchytskyy , Daniel Schaefer , Min Xu , Jordan Justen , Gerd Hoffmann , Peter Grehan , Erdem Aktas , James Bottomley , "Lendacky, Thomas" , "Roth, Michael" , Sunil V L , Andrei Warkentin Subject: Re: [PATCH 07/18] EmbeddedPkg: Update code to be more C11 compliant by using __func__ Thread-Topic: [PATCH 07/18] EmbeddedPkg: Update code to be more C11 compliant by using __func__ Thread-Index: AQHZaNZ/njev84XiSkOqq9bbSMmJJK8fgz1w Date: Fri, 7 Apr 2023 08:25:18 +0000 Message-ID: References: <20230406222319.2281263-1-rebecca@bsdio.com> <20230406222319.2281263-8-rebecca@bsdio.com> In-Reply-To: <20230406222319.2281263-8-rebecca@bsdio.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Enabled=true; MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SetDate=2023-04-07T08:25:15Z; MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Method=Standard; MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Name=General; MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ActionId=55f209e9-fcfb-4433-8488-c16765251757; MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ContentBits=1 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN2PR12MB3966:EE_|SN7PR12MB7810:EE_ x-ms-office365-filtering-correlation-id: 86762572-3d31-46ef-a250-08db37419f38 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wlm5H7baUPL5WU/GpgJRdJQYuSgvew3e+UAjvHYTQe7xrIQzsMiU4IXBzqqIUZAxjRZLfl2BZaDE05kp4SHu6xw9c2GZwdQ341Af+Dx0fQVwQnzALn6uDErEKVxYut6VtuRj6LW7lO7hLMsYaKl5+Yck9MeBlx8MVnQCsvdL5sQAsRnj3qWPeHO3b+pIRIASS/o9MYOLGrbdDH7+fX895Ld119diYM6aZu/OvLM/gE+c5//K109X1IZJjW5UsJucjl9pSrJeo/5HtsaiDFCQVpbGbl9hlQ5y7jWvCZzKIDJ6/s2yAKrS/kOj8N0IGvcPeI8ACrMYurDHimTc7hOESXooPn8vTTJJBQoJt4dsHA9yZKOsB+LZEF5UHn2urcTuLP3m5H3a5/7OXPYuAiC7RTY1bZJzz8CIWR19a1RCS9dPjXIaSL08OWVs5qzhdXuF8225uNblkSUf3qjmZKplYxUZC7oxro3+UAZDl0cpA44V4STTBSuWY2ojcryimoPUnGIs5WnKBIDpcWyjN2kHVSuAUY/VFWvR82U5CVdTRpVqlKI+Dbq7gtJj5ceEgzV+UGbd6DH96YtGRPX7kkcNhrwhV/i1MpXcv7/e32gnrPXmpwobvWxZ1kZq4ydXQ76QM13TFfrLApx7NzItLuOjeQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR12MB3966.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(366004)(346002)(136003)(39860400002)(376002)(396003)(451199021)(83380400001)(52536014)(2906002)(8676002)(55016003)(15650500001)(110136005)(6506007)(26005)(53546011)(9686003)(186003)(478600001)(64756008)(76116006)(41300700001)(66446008)(66946007)(4326008)(66556008)(66476007)(71200400001)(316002)(54906003)(7416002)(30864003)(8936002)(7696005)(7406005)(5660300002)(122000001)(38100700002)(33656002)(921005)(38070700005)(86362001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?UxTozh2xpeYlPESK4MWBLBwXYBKmEvw4B7fhe4U0zDbzQppda9lXYRahd8UK?= =?us-ascii?Q?mw9SCKOQwqVYUQm1xsE0LEb5HO3AAw4Vf4LLw6GkHePCX1p0FTHsPbuGEDiU?= =?us-ascii?Q?Eo6diNbOUquoOAWjldIvRrsmojQd/Rl6E1A3ZkgkMvKe+gsFFigHGIAWc0Y3?= =?us-ascii?Q?WCZD2ltwMwnEw5FY16hbdbLxy/iW8a0kpH8UmwfZmO/M/MdhIOxh+pzZGSwb?= =?us-ascii?Q?1sZjMMMuPvl6ieyLbRavIe9AE/O2rrijmkzdm3UmraHxlzhL6WJlVcYIGwVN?= =?us-ascii?Q?5yZGT2vI3onXs6V1rT36tirx+FOf7mvOU1k9PFfMtbsNfc7jDGPycxo1LcBP?= =?us-ascii?Q?8C0QutifZ5x8unzYMKjMAPFiT9d+FOerZhgKyUI9+3sHJgYx93tsYxNo5sup?= =?us-ascii?Q?ipUw0svg3ZUhRUI7y3111eeoAbAxxYq36xrV61DunJyIY9kDQZR9ATPqaH3u?= =?us-ascii?Q?0ejIv8Ex6Yc0BCHSzebp2pG99oNl2FmjCPh/Mx8x9/zLUlbR+/ylQ39IQR/G?= =?us-ascii?Q?IMzdmzEHbQ6ZZhmVj5Sen7SOLcqVawnfLam/4E/2TjZsSyLBWmeb3t2Y3tEm?= =?us-ascii?Q?wr8b7Mb5ORogi8h7ozoEymjyuvDfxNlL8j6RCHvJ2JVKrlSenNUIp+CCO7d+?= =?us-ascii?Q?I9C2HHlc9JFfjM9zAKE62Li7d/ek288h9Y8XaQNcQ8/dJODZAVGwAcr/o5x7?= =?us-ascii?Q?yYeHTZOlny1RTElpH55M4QngcRRzx3XexIjQynmFBPXvwOqyXHpJcPEmcT74?= =?us-ascii?Q?fFwU0J/9mQmoakgykK7ZjiSCkZ/wbS+ivto/E/w1Mgij9SCyF9NBnYYbwO8t?= =?us-ascii?Q?aPCBe1QDCsXphrIsSf7hI59dvHZbu6HFmeIJP4gWoWZqa90k1qNb+laviYy+?= =?us-ascii?Q?cbuiWLImTtrMdPlMOTynPnoaAQzwpkGa4WzBzaqRLChysRd8BnzHaFSvfCoL?= =?us-ascii?Q?RnD50hjJbvPqRtDnWep/QD3lRbmkcGPLxUdvDOAIjWQJ0xMXcvAvsuvOuP5x?= =?us-ascii?Q?awIs4PWRFghF72cl3RVjoigNZOyNW6QcbJCH7JX+pobBYvcjWPTKi1qiqXLY?= =?us-ascii?Q?kdozAwQm+IEhbN2C3eOlNiM2KhdR5z8bKSETDeQhRXq4EgPZR3rrxPwMmBf2?= =?us-ascii?Q?zM+QG38tSg8PDoBbkpjLyP+tsqD/4AKoKJQUWl+0+QzA3A86rKuMLoL9BRR5?= =?us-ascii?Q?QdKXMFKXSV8owCrCPNPzhFwvWpJUD1Da5ilFxZ+ZcZ6AY4tq7IBKkWuZmFib?= =?us-ascii?Q?nCiXD45rmP7ULG3eQc8JlO5gekV2/YrRR+0omnWre/1vX0n8twCrUowL0SCN?= =?us-ascii?Q?Kz8TMkh7O7E8NKiXCS+hbbJk9fAF1lSEvyHnB6yov4Iq+M/O66WR1EcrBJBT?= =?us-ascii?Q?Ql1wErtQDpE+BwaEU9yWVpdXigKoooChVx7KVdeKw0EaPEorAASi/A7ffS1X?= =?us-ascii?Q?O335kDHGX0iYzrX2PJhhSTSUhEbRidBgiGn3mL0nQ9Er1FLyz4ypWn0IRS6I?= =?us-ascii?Q?Ty67oBvXxfs5EMF5hnAp6czIMCYoxxHRAKAyO3ZVzoN63cO/BmpAQKHo924/?= =?us-ascii?Q?OfuHpVGJycjQz83G61o=3D?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3966.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86762572-3d31-46ef-a250-08db37419f38 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Apr 2023 08:25:18.6492 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: tH8vRUA2LC0ZTvD/P2JV/ihdNbGeqpvQE1ZTU/iF4MLbfuI7emNvGAgvprIoP3YvFvw33IGDqReEZQlEUkZGdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7810 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable [AMD Official Use Only - General] Reviewed-by: Abner Chang > -----Original Message----- > From: Rebecca Cran > Sent: Friday, April 7, 2023 6:23 AM > To: devel@edk2.groups.io; Liming Gao ; > Michael D Kinney ; Guomin Jiang > ; Wei6 Xu ; Guo Dong > ; Ray Ni ; Sean Rhodes > ; James Lu ; Gua Guo > ; Andrew Fish ; Hao A Wu > ; Maciej Rabeda ; > Siyuan Fu ; Jiewen Yao ; Jian > J Wang ; Xiaoyu Lu ; Ard > Biesheuvel ; Sami Mujawar > ; Supreeth Venkatesh > ; Michael Kubacki > ; Nate DeSimone > ; Sean Brogan > > Cc: Rebecca Cran ; Leif Lindholm > ; Chang, Abner ; > Nickle Wang ; Igor Kulchytskyy ; > Daniel Schaefer ; Min Xu ; > Jordan Justen ; Gerd Hoffmann > ; Peter Grehan ; Erdem Aktas > ; James Bottomley ; > Lendacky, Thomas ; Roth, Michael > ; Sunil V L ; Andrei > Warkentin > Subject: [PATCH 07/18] EmbeddedPkg: Update code to be more C11 > compliant by using __func__ >=20 > Caution: This message originated from an External Source. Use proper > caution when opening attachments, clicking links, or responding. >=20 >=20 > __FUNCTION__ is a pre-standard extension that gcc and Visual C++ among > others support, while __func__ was standardized in C99. >=20 > Since it's more standard, replace __FUNCTION__ with __func__ throughout > EmbeddedPkg. >=20 > Visual Studio versions before VS 2015 don't support __func__ and so will = fail > to compile. A workaround is to define __func__ as __FUNCTION__ : >=20 > #define __func__ __FUNCTION__ >=20 > Signed-off-by: Rebecca Cran > --- > EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c | 18 > ++++++++-------- > EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c | 10 ++++----- > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c | 22 +++++++++= +- > --------- > EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c | 2 +- > EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c | 2 +- > EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 20 > +++++++++--------- > 6 files changed, 37 insertions(+), 37 deletions(-) >=20 > diff --git a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c > b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c > index 07b82892eb0f..2c2e73e72076 100644 > --- a/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c > +++ b/EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.c > @@ -116,7 +116,7 @@ RemoveDtStdoutPath ( > DEBUG (( > DEBUG_INFO, > "%a: could not retrieve DT blob - %r\n", > - __FUNCTION__, > + __func__, > Status > )); > return; > @@ -132,7 +132,7 @@ RemoveDtStdoutPath ( > DEBUG (( > DEBUG_INFO, > "%a: Failed to delete 'stdout-path' property: %a\n", > - __FUNCTION__, > + __func__, > fdt_strerror (Error) > )); > } > @@ -190,7 +190,7 @@ RemoveSpcrTable ( > DEBUG (( > DEBUG_WARN, > "%a: failed to uninstall SPCR table - %r\n", > - __FUNCTION__, > + __func__, > Status > )); > } > @@ -224,7 +224,7 @@ OnReadyToBoot ( > DEBUG (( > DEBUG_ERROR, > "%a: variable '%s' could not be read - bailing!\n", > - __FUNCTION__, > + __func__, > CONSOLE_PREF_VARIABLE_NAME > )); > return; > @@ -234,7 +234,7 @@ OnReadyToBoot ( > DEBUG (( > DEBUG_INFO, > "%a: serial console preferred - doing nothing\n", > - __FUNCTION__ > + __func__ > )); > return; > } > @@ -247,7 +247,7 @@ OnReadyToBoot ( > DEBUG (( > DEBUG_INFO, > "%a: no GOP instances found - doing nothing (%r)\n", > - __FUNCTION__, > + __func__, > Status > )); > return; > @@ -296,7 +296,7 @@ ConsolePrefDxeEntryPoint ( > DEBUG (( > DEBUG_INFO, > "%a: no console preference found, defaulting to graphical\n", > - __FUNCTION__ > + __func__ > )); > ConsolePref.Console =3D CONSOLE_PREF_GRAPHICAL; > } > @@ -308,7 +308,7 @@ ConsolePrefDxeEntryPoint ( > DEBUG (( > DEBUG_WARN, > "%a: invalid value for %s, defaulting to graphical\n", > - __FUNCTION__, > + __func__, > CONSOLE_PREF_VARIABLE_NAME > )); > ConsolePref.Console =3D CONSOLE_PREF_GRAPHICAL; @@ -332,7 +332,7 > @@ ConsolePrefDxeEntryPoint ( > DEBUG (( > DEBUG_ERROR, > "%a: gRT->SetVariable () failed - %r\n", > - __FUNCTION__, > + __func__, > Status > )); > return Status; > diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c > b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c > index 7f7e8c446c98..b94cd4da25d1 100644 > --- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c > +++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c > @@ -122,7 +122,7 @@ DtPlatformDxeEntryPoint ( > DEBUG (( > DEBUG_WARN, > "%a: no DTB blob could be loaded, defaulting to ACPI (Status =3D= =3D %r)\n", > - __FUNCTION__, > + __func__, > Status > )); > DtAcpiPref.Pref =3D DT_ACPI_SELECT_ACPI; @@ -142,7 +142,7 @@ > DtPlatformDxeEntryPoint ( > DEBUG (( > DEBUG_WARN, > "%a: no DT/ACPI preference found, defaulting to %a\n", > - __FUNCTION__, > + __func__, > PcdGetBool (PcdDefaultDtPref) ? "DT" : "ACPI" > )); > DtAcpiPref.Pref =3D PcdGetBool (PcdDefaultDtPref) ? DT_ACPI_SELECT= _DT > @@ -157,7 +157,7 @@ DtPlatformDxeEntryPoint ( > DEBUG (( > DEBUG_WARN, > "%a: invalid value for %s, defaulting to %a\n", > - __FUNCTION__, > + __func__, > DT_ACPI_VARIABLE_NAME, > PcdGetBool (PcdDefaultDtPref) ? "DT" : "ACPI" > )); > @@ -197,7 +197,7 @@ DtPlatformDxeEntryPoint ( > DEBUG (( > DEBUG_ERROR, > "%a: failed to install gEdkiiPlatformHasAcpiGuid as a protocol\n= ", > - __FUNCTION__ > + __func__ > )); > goto FreeDtb; > } > @@ -211,7 +211,7 @@ DtPlatformDxeEntryPoint ( > DEBUG (( > DEBUG_ERROR, > "%a: failed to install FDT configuration table\n", > - __FUNCTION__ > + __func__ > )); > goto FreeDtb; > } > diff --git a/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c > b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c > index b182c77d19b1..7da505a313d7 100644 > --- a/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c > +++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c > @@ -222,7 +222,7 @@ FindCompatibleNodeReg ( > DEBUG (( > DEBUG_ERROR, > "%a: '%a' compatible node has invalid 'reg' property (size =3D=3D = 0x%x)\n", > - __FUNCTION__, > + __func__, > CompatibleString, > *RegSize > )); > @@ -263,7 +263,7 @@ FindNextMemoryNodeReg ( > } >=20 > if (!IsNodeEnabled (Next)) { > - DEBUG ((DEBUG_WARN, "%a: ignoring disabled memory node\n", > __FUNCTION__)); > + DEBUG ((DEBUG_WARN, "%a: ignoring disabled memory node\n", > + __func__)); > continue; > } >=20 > @@ -279,7 +279,7 @@ FindNextMemoryNodeReg ( > DEBUG (( > DEBUG_WARN, > "%a: ignoring memory node with no 'reg' property\n", > - __FUNCTION__ > + __func__ > )); > continue; > } > @@ -288,7 +288,7 @@ FindNextMemoryNodeReg ( > DEBUG (( > DEBUG_WARN, > "%a: ignoring memory node with invalid 'reg' property (size = =3D=3D > 0x%x)\n", > - __FUNCTION__, > + __func__, > *RegSize > )); > continue; > @@ -391,7 +391,7 @@ OnPlatformHasDeviceTree ( > DEBUG (( > DEBUG_INFO, > "%a: exposing DTB @ 0x%p to OS\n", > - __FUNCTION__, > + __func__, > DeviceTreeBase > )); > Status =3D gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeB= ase); > @@ -424,7 +424,7 @@ InitializeFdtClientDxe ( > DEBUG (( > DEBUG_ERROR, > "%a: No DTB found @ 0x%p\n", > - __FUNCTION__, > + __func__, > DeviceTreeBase > )); > return EFI_NOT_FOUND; > @@ -432,7 +432,7 @@ InitializeFdtClientDxe ( >=20 > mDeviceTreeBase =3D DeviceTreeBase; >=20 > - DEBUG ((DEBUG_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, > mDeviceTreeBase)); > + DEBUG ((DEBUG_INFO, "%a: DTB @ 0x%p\n", __func__, > mDeviceTreeBase)); >=20 > // > // Register a protocol notify for the EDKII Platform Has Device Tree @= @ - > 446,7 +446,7 @@ InitializeFdtClientDxe ( > &PlatformHasDeviceTreeEvent > ); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a: CreateEvent(): %r\n", __FUNCTION__, > Status)); > + DEBUG ((DEBUG_ERROR, "%a: CreateEvent(): %r\n", __func__, Status)); > return Status; > } >=20 > @@ -459,7 +459,7 @@ InitializeFdtClientDxe ( > DEBUG (( > DEBUG_ERROR, > "%a: RegisterProtocolNotify(): %r\n", > - __FUNCTION__, > + __func__, > Status > )); > goto CloseEvent; > @@ -470,7 +470,7 @@ InitializeFdtClientDxe ( > // > Status =3D gBS->SignalEvent (PlatformHasDeviceTreeEvent); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a: SignalEvent(): %r\n", __FUNCTION__, > Status)); > + DEBUG ((DEBUG_ERROR, "%a: SignalEvent(): %r\n", __func__, Status)); > goto CloseEvent; > } >=20 > @@ -484,7 +484,7 @@ InitializeFdtClientDxe ( > DEBUG (( > DEBUG_ERROR, > "%a: InstallProtocolInterface(): %r\n", > - __FUNCTION__, > + __func__, > Status > )); > goto CloseEvent; > diff --git > a/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c > b/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c > index 44a78c947ef4..e193352fbe41 100644 > --- a/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c > +++ b/EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.c > @@ -349,7 +349,7 @@ DmaMap ( > "%a: Operation type 'MapOperationBusMasterCommonBuffer' is only " > "supported\non memory regions that were allocated using " > "DmaAllocateBuffer ()\n", > - __FUNCTION__ > + __func__ > )); > Status =3D EFI_UNSUPPORTED; > FreeMapInfo: > diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c > b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c > index 7adb7324057e..17dde432c4eb 100644 > --- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c > +++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c > @@ -219,7 +219,7 @@ InitializeRealTimeClock ( > DEBUG (( > DEBUG_WARN, > "%a: using default timezone/daylight settings\n", > - __FUNCTION__ > + __func__ > )); >=20 > mTimeSettings.TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; diff --git > a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > index 86eb55800e5a..57388d9f461c 100755 > --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > @@ -414,13 +414,13 @@ InitializeSdMmcDevice ( >=20 > Status =3D MmcHost->SendCommand (MmcHost, MMC_CMD55, CmdArg); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } >=20 > Status =3D MmcHost->ReceiveResponse (MmcHost, > MMC_RESPONSE_TYPE_R1, Response); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } >=20 > @@ -473,18 +473,18 @@ InitializeSdMmcDevice ( > CmdArg =3D CreateSwitchCmdArgument (0, 0, 0); > Status =3D MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } else { > Status =3D MmcHost->ReadBlockData (MmcHost, 0, > SWITCH_CMD_DATA_LENGTH, Buffer); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and > Status =3D %r\n", __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and > + Status =3D %r\n", __func__, Status)); > return Status; > } > } >=20 > if (!(Buffer[3] & SD_HIGH_SPEED_SUPPORTED)) { > - DEBUG ((DEBUG_INFO, "%a : High Speed not supported by Card\n", > __FUNCTION__)); > + DEBUG ((DEBUG_INFO, "%a : High Speed not supported by Card\n", > + __func__)); > } else { > Speed =3D SD_HIGH_SPEED; >=20 > @@ -492,12 +492,12 @@ InitializeSdMmcDevice ( > CmdArg =3D CreateSwitchCmdArgument (1, 0, 1); > Status =3D MmcHost->SendCommand (MmcHost, MMC_CMD6, CmdArg); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } else { > Status =3D MmcHost->ReadBlockData (MmcHost, 0, > SWITCH_CMD_DATA_LENGTH, Buffer); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and > Status =3D %r\n", __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): ReadBlockData Error and > + Status =3D %r\n", __func__, Status)); > return Status; > } >=20 > @@ -513,14 +513,14 @@ InitializeSdMmcDevice ( > CmdArg =3D MmcHostInstance->CardInfo.RCA << 16; > Status =3D MmcHost->SendCommand (MmcHost, MMC_CMD55, CmdArg); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD55): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } >=20 > /* Width: 4 */ > Status =3D MmcHost->SendCommand (MmcHost, MMC_CMD6, 2); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (MMC_CMD6): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } > } > @@ -528,7 +528,7 @@ InitializeSdMmcDevice ( > if (MMC_HOST_HAS_SETIOS (MmcHost)) { > Status =3D MmcHost->SetIos (MmcHost, Speed, BUSWIDTH_4, > EMMCBACKWARD); > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status =3D %r\n", > __FUNCTION__, Status)); > + DEBUG ((DEBUG_ERROR, "%a (SetIos): Error and Status =3D %r\n", > + __func__, Status)); > return Status; > } > } > -- > 2.34.1