Commit 6acab49a authored by Herve Codina's avatar Herve Codina Committed by Wen Zhiwei
Browse files

of: address: Remove duplicated functions 

stable inclusion
from stable-v6.6.70
commit 7a40a884f597750d4ed6915edfaed5bc7f10e084
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7a40a884f597750d4ed6915edfaed5bc7f10e084



--------------------------------

[ Upstream commit 3eb030c60835668997d5763b1a0c7938faf169f6 ]

The recently added of_bus_default_flags_translate() performs the exact
same operation as of_bus_pci_translate() and of_bus_isa_translate().

Avoid duplicated code replacing both of_bus_pci_translate() and
of_bus_isa_translate() with of_bus_default_flags_translate().

Signed-off-by: default avatarHerve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20231017110221.189299-3-herve.codina@bootlin.com


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Stable-dep-of: 7f05e20b989a ("of: address: Preserve the flags portion on 1:1 dma-ranges mapping")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 1151a1ef

drivers/of/address.c

+2 −11
Original line number Diff line number Diff line
@@ -217,10 +217,6 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns, 
	return da - cp;

}



static int of_bus_pci_translate(__be32 *addr, u64 offset, int na)

{

	return of_bus_default_translate(addr + 1, offset, na - 1);

}

#endif /* CONFIG_PCI */



/*
@@ -344,11 +340,6 @@ static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns, 
	return da - cp;

}



static int of_bus_isa_translate(__be32 *addr, u64 offset, int na)

{

	return of_bus_default_translate(addr + 1, offset, na - 1);

}



static unsigned int of_bus_isa_get_flags(const __be32 *addr)

{

	unsigned int flags = 0;
@@ -379,7 +370,7 @@ static struct of_bus of_busses[] = { 
		.match = of_bus_pci_match,

		.count_cells = of_bus_pci_count_cells,

		.map = of_bus_pci_map,

		.translate = of_bus_pci_translate,

		.translate = of_bus_default_flags_translate,

		.has_flags = true,

		.get_flags = of_bus_pci_get_flags,

	},
@@ -391,7 +382,7 @@ static struct of_bus of_busses[] = { 
		.match = of_bus_isa_match,

		.count_cells = of_bus_isa_count_cells,

		.map = of_bus_isa_map,

		.translate = of_bus_isa_translate,

		.translate = of_bus_default_flags_translate,

		.has_flags = true,

		.get_flags = of_bus_isa_get_flags,

	},