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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmQlfS8RHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXMRGRAA2alzeTzbnWc/jQivXGdeoENVXtEd7cus
 6zOob1echRIjv7e20lEcJx738+/RvqtJgWrIUb9VJ9go8xVm7/ZPDSbn9FmCoCtp
 cJ3vTEgWthWvIgH4IGheVk2Uy6v+71WcOjjRIEE8D7Mvn5Zcw2lFWqX1Z/Wpoxmr
 iE1iOl5ooOTGLV7fsI5dG7Pa27d36KqhAXBXtrOQUp7DxpPrL+G9xmJPU1VqdfqH
 WaGQvaATEjcjcxTR0fipsPGkkPKFnF69+mHwIuygZrSU2XO86hqZ6EhxMlnTvzkf
 7DdwsRDu+I+t3wox5kpyWZQC1t2Ka7exrOF1PNmTNtNzfxZBdzTdo7CEJR8aaQfr
 o9e0u/t2gKobWZ33nXx6RK8Z1Oryd7wW83XnjxOFAIOaGeY73iX2G3CcESeoyvmm
 RMjOMUXNn/uDc8Knc8utAcvOjNfjDJXIZcJvIyO3xnVH6A2Qdy/mM8VrM6XPkWwm
 jOveCxs+0wItXVDjbaKvWT8f74ac8Vvf58BNFGHrW/GoAC1V7BPqu1QzqjgzaY/q
 Rmbr+RcsFJ/T/7Bm4fQ2qmZmK9Soq5qIA1L/Ff/Ts3y5VOqDwKmdWFKYSt0kVw7q
 NesKhHnbrPmXYL5aVsQaYGPx95IMKojLxXPS0hjvdktwZqTWMbvKP+EqpcNkTaQz
 cY6y11LLdKw=
 =vv6B
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQsLyIACgkQmmx57+YA
 GNmSkw//W6PHlJQhiObIeRMjt5ZJ4vt69Lk7en2dm7yDU4rvbHzaw/VH427gqQ7Y
 sjiocjbnfYeNX6E6LNDNUacUSoT0coWjBIfJ67ArQtwmRVEWs4fbLANvU4lZQZb9
 kQkq8WSEKloEy0b0su5i26cGpxmRI7OQLTx/jN7NFjhANWtqm8chjQmOnT5MmTOx
 PixZBVd886Sr23/3d9XvoVg2OwWlNwO5tsaQzd9izn71Jj9pTVMZpRGlqnSVLWoB
 Qn8hpgj3AXbvi5KxorcXx3UTyjEEwiejA0I0iiAYhLGy9CLRtJ7Vu7O0MGbjL1+p
 T7/XZPkyeQ8Dy0jbxwoKoIeXyk5gxJpLpA0dgHnk8pM6+8oioA8cyVPmxTTmBfb2
 x26Ei0fIfvcZWJl2up+DkKbcrLatQFTiVr9XgnBedYIKEXg/3CQIPyuWvxIo0e5I
 kC4k4T9nj94dua+rSnHVnyd9r62Q7hCS9G0XcQyN0E/5jPx9lqh01Djglbk2tkv5
 5uwFso29EZNVq8isDqizO+f0+BWgkrYnhjETpDWFFnWRZNO1p9f0r5RyHpYhtQ3S
 1pAJz1IysTxOR6c3m4EzWfSfGDpRCQ834ik2X8P9UoFzY2qwACG0ol76moSzb2Ot
 n2Up+eUAlJImDK5mBY2t7MGuZz6rYCztVQ8MVjaKJEmsKEZTghk=
 =d9+X
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2023-04-04 16:07:26 +02:00
commit 4e7b171f4e

View File

@ -648,43 +648,20 @@ static int sysc_init_resets(struct sysc *ddata)
static int sysc_parse_and_check_child_range(struct sysc *ddata)
{
struct device_node *np = ddata->dev->of_node;
const __be32 *ranges;
u32 nr_addr, nr_size;
int len, error;
struct of_range_parser parser;
struct of_range range;
int error;
ranges = of_get_property(np, "ranges", &len);
if (!ranges) {
dev_err(ddata->dev, "missing ranges for %pOF\n", np);
return -ENOENT;
}
len /= sizeof(*ranges);
if (len < 3) {
dev_err(ddata->dev, "incomplete ranges for %pOF\n", np);
return -EINVAL;
}
error = of_property_read_u32(np, "#address-cells", &nr_addr);
error = of_range_parser_init(&parser, np);
if (error)
return -ENOENT;
return error;
error = of_property_read_u32(np, "#size-cells", &nr_size);
if (error)
return -ENOENT;
if (nr_addr != 1 || nr_size != 1) {
dev_err(ddata->dev, "invalid ranges for %pOF\n", np);
return -EINVAL;
for_each_of_range(&parser, &range) {
ddata->module_pa = range.cpu_addr;
ddata->module_size = range.size;
break;
}
ranges++;
ddata->module_pa = of_translate_address(np, ranges++);
ddata->module_size = be32_to_cpup(ranges);
return 0;
}
@ -913,7 +890,7 @@ static int sysc_check_registers(struct sysc *ddata)
* within the interconnect target module range. For example, SGX has
* them at offset 0x1fc00 in the 32MB module address space. And cpsw
* has them at offset 0x1200 in the CPSW_WR child. Usually the
* the interconnect target module registers are at the beginning of
* interconnect target module registers are at the beginning of
* the module range though.
*/
static int sysc_ioremap(struct sysc *ddata)
@ -964,7 +941,7 @@ static int sysc_map_and_check_registers(struct sysc *ddata)
sysc_check_children(ddata);
if (!of_get_property(np, "reg", NULL))
if (!of_property_present(np, "reg"))
return 0;
error = sysc_parse_registers(ddata);
@ -2530,11 +2507,9 @@ static struct dev_pm_domain sysc_child_pm_domain = {
static void sysc_reinit_modules(struct sysc_soc_info *soc)
{
struct sysc_module *module;
struct list_head *pos;
struct sysc *ddata;
list_for_each(pos, &sysc_soc->restored_modules) {
module = list_entry(pos, struct sysc_module, node);
list_for_each_entry(module, &sysc_soc->restored_modules, node) {
ddata = module->ddata;
sysc_reinit_module(ddata, ddata->enabled);
}
@ -3214,12 +3189,10 @@ static void sysc_cleanup_static_data(void)
static int sysc_check_disabled_devices(struct sysc *ddata)
{
struct sysc_address *disabled_module;
struct list_head *pos;
int error = 0;
mutex_lock(&sysc_soc->list_lock);
list_for_each(pos, &sysc_soc->disabled_modules) {
disabled_module = list_entry(pos, struct sysc_address, node);
list_for_each_entry(disabled_module, &sysc_soc->disabled_modules, node) {
if (ddata->module_pa == disabled_module->base) {
dev_dbg(ddata->dev, "module disabled for this SoC\n");
error = -ENODEV;