The following commit has been merged into the perf/core branch of tip: Commit-ID: 2c65477f14a359db9f1edee5dd8e683d3dae69e2 Gitweb: https://git.kernel.org/tip/2c65477f14a359db9f1edee5dd8e683d3dae69e2 Author: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx> AuthorDate: Thu, 24 Aug 2023 16:28:32 +03:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Thu, 24 Aug 2023 21:25:24 +02:00 perf/x86/uncore: Remove unnecessary ?: operator around pcibios_err_to_errno() call If err == 0, pcibios_err_to_errno(err) returns 0 so the ?: construct can be removed. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230824132832.78705-15-ilpo.jarvinen@xxxxxxxxxxxxxxx --- arch/x86/events/intel/uncore_snbep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index d49e90d..4d34998 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -1502,7 +1502,7 @@ static int snbep_pci2phy_map_init(int devid, int nodeid_loc, int idmap_loc, bool pci_dev_put(ubox_dev); - return err ? pcibios_err_to_errno(err) : 0; + return pcibios_err_to_errno(err); } int snbep_uncore_pci_init(void)
|