shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

of: address: Remove duplicated functions

Browse Source 
[ 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: Herve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20231017110221.189299-3-herve.codina@bootlin.com
Signed-off-by: Rob Herring <robh@kernel.org>
Stable-dep-of: 7f05e20b989a ("of: address: Preserve the flags portion on 1:1 dma-ranges mapping")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Herve Codina
2023-10-17 13:02:17 +02:00
committed by Greg Kroah-Hartman
parent 30eb1123b2
commit 7eb954ec96
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/of/address.c
View File

@@ -221,10 +221,6 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
return da - cp; 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 */ #endif /* CONFIG_PCI */
int of_pci_address_to_resource(struct device_node *dev, int bar, int of_pci_address_to_resource(struct device_node *dev, int bar,
@@ -334,11 +330,6 @@ static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
return da - cp; 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) static unsigned int of_bus_isa_get_flags(const __be32 *addr)
{ {
unsigned int flags = 0; unsigned int flags = 0;
@@ -369,7 +360,7 @@ static struct of_bus of_busses[] = {
.match = of_bus_pci_match, .match = of_bus_pci_match,
.count_cells = of_bus_pci_count_cells, .count_cells = of_bus_pci_count_cells,
.map = of_bus_pci_map, .map = of_bus_pci_map,
.translate = of_bus_pci_translate, .translate = of_bus_default_flags_translate,
.has_flags = true, .has_flags = true,
.get_flags = of_bus_pci_get_flags, .get_flags = of_bus_pci_get_flags,
}, },
@@ -381,7 +372,7 @@ static struct of_bus of_busses[] = {
.match = of_bus_isa_match, .match = of_bus_isa_match,
.count_cells = of_bus_isa_count_cells, .count_cells = of_bus_isa_count_cells,
.map = of_bus_isa_map, .map = of_bus_isa_map,
.translate = of_bus_isa_translate, .translate = of_bus_default_flags_translate,
.has_flags = true, .has_flags = true,
.get_flags = of_bus_isa_get_flags, .get_flags = of_bus_isa_get_flags,
}, },