Skip to content

Commit 4e7b171

Browse files
committed
Merge tag 'omap-for-v6.4/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/drivers
Clean-up for ti-sysc driver for v6.4 Clean-up for ti-sysc interconnect target module driver mostly to remove open coded ranges property parsing, to use of_property_present(), and to use list_for_each_entry(). Also included is one comment typo change. * tag 'omap-for-v6.4/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: bus: ti-sysc: Fix comment typo bus: ti-sysc: Use list_for_each_entry() helper bus: ti-sysc: Use of_property_present() for testing DT property presence bus: ti-sysc: Remove open coded "ranges" parsing Link: https://lore.kernel.org/r/pull-1680180355-69164@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 33063e5 + b79ad23 commit 4e7b171

1 file changed

Lines changed: 13 additions & 40 deletions

File tree

drivers/bus/ti-sysc.c

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -648,43 +648,20 @@ static int sysc_init_resets(struct sysc *ddata)
648648
static int sysc_parse_and_check_child_range(struct sysc *ddata)
649649
{
650650
struct device_node *np = ddata->dev->of_node;
651-
const __be32 *ranges;
652-
u32 nr_addr, nr_size;
653-
int len, error;
654-
655-
ranges = of_get_property(np, "ranges", &len);
656-
if (!ranges) {
657-
dev_err(ddata->dev, "missing ranges for %pOF\n", np);
658-
659-
return -ENOENT;
660-
}
661-
662-
len /= sizeof(*ranges);
663-
664-
if (len < 3) {
665-
dev_err(ddata->dev, "incomplete ranges for %pOF\n", np);
666-
667-
return -EINVAL;
668-
}
669-
670-
error = of_property_read_u32(np, "#address-cells", &nr_addr);
671-
if (error)
672-
return -ENOENT;
651+
struct of_range_parser parser;
652+
struct of_range range;
653+
int error;
673654

674-
error = of_property_read_u32(np, "#size-cells", &nr_size);
655+
error = of_range_parser_init(&parser, np);
675656
if (error)
676-
return -ENOENT;
677-
678-
if (nr_addr != 1 || nr_size != 1) {
679-
dev_err(ddata->dev, "invalid ranges for %pOF\n", np);
657+
return error;
680658

681-
return -EINVAL;
659+
for_each_of_range(&parser, &range) {
660+
ddata->module_pa = range.cpu_addr;
661+
ddata->module_size = range.size;
662+
break;
682663
}
683664

684-
ranges++;
685-
ddata->module_pa = of_translate_address(np, ranges++);
686-
ddata->module_size = be32_to_cpup(ranges);
687-
688665
return 0;
689666
}
690667

@@ -913,7 +890,7 @@ static int sysc_check_registers(struct sysc *ddata)
913890
* within the interconnect target module range. For example, SGX has
914891
* them at offset 0x1fc00 in the 32MB module address space. And cpsw
915892
* has them at offset 0x1200 in the CPSW_WR child. Usually the
916-
* the interconnect target module registers are at the beginning of
893+
* interconnect target module registers are at the beginning of
917894
* the module range though.
918895
*/
919896
static int sysc_ioremap(struct sysc *ddata)
@@ -964,7 +941,7 @@ static int sysc_map_and_check_registers(struct sysc *ddata)
964941

965942
sysc_check_children(ddata);
966943

967-
if (!of_get_property(np, "reg", NULL))
944+
if (!of_property_present(np, "reg"))
968945
return 0;
969946

970947
error = sysc_parse_registers(ddata);
@@ -2530,11 +2507,9 @@ static struct dev_pm_domain sysc_child_pm_domain = {
25302507
static void sysc_reinit_modules(struct sysc_soc_info *soc)
25312508
{
25322509
struct sysc_module *module;
2533-
struct list_head *pos;
25342510
struct sysc *ddata;
25352511

2536-
list_for_each(pos, &sysc_soc->restored_modules) {
2537-
module = list_entry(pos, struct sysc_module, node);
2512+
list_for_each_entry(module, &sysc_soc->restored_modules, node) {
25382513
ddata = module->ddata;
25392514
sysc_reinit_module(ddata, ddata->enabled);
25402515
}
@@ -3214,12 +3189,10 @@ static void sysc_cleanup_static_data(void)
32143189
static int sysc_check_disabled_devices(struct sysc *ddata)
32153190
{
32163191
struct sysc_address *disabled_module;
3217-
struct list_head *pos;
32183192
int error = 0;
32193193

32203194
mutex_lock(&sysc_soc->list_lock);
3221-
list_for_each(pos, &sysc_soc->disabled_modules) {
3222-
disabled_module = list_entry(pos, struct sysc_address, node);
3195+
list_for_each_entry(disabled_module, &sysc_soc->disabled_modules, node) {
32233196
if (ddata->module_pa == disabled_module->base) {
32243197
dev_dbg(ddata->dev, "module disabled for this SoC\n");
32253198
error = -ENODEV;

0 commit comments

Comments
 (0)