Commit 9c9a7ff9 authored by Shiji Yang's avatar Shiji Yang Committed by Thomas Bogendoerfer
Browse files

MIPS: lantiq: falcon: sysctrl: fix request memory check logic



request_mem_region() will return NULL instead of error code
when the memory request fails. Therefore, we should check if
the return value is non-zero instead of less than zero. In
this way, this patch also fixes the build warnings:

arch/mips/lantiq/falcon/sysctrl.c:214:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  214 |                                 res_status.name) < 0) ||
      |                                                  ^
arch/mips/lantiq/falcon/sysctrl.c:216:47: error: ordered comparison of pointer with integer zero [-Werror=extra]
  216 |                                 res_ebu.name) < 0) ||
      |                                               ^
arch/mips/lantiq/falcon/sysctrl.c:219:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  219 |                                 res_sys[0].name) < 0) ||
      |                                                  ^
arch/mips/lantiq/falcon/sysctrl.c:222:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  222 |                                 res_sys[1].name) < 0) ||
      |                                                  ^
arch/mips/lantiq/falcon/sysctrl.c:225:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  225 |                                 res_sys[2].name) < 0))
      |

Signed-off-by: default avatarShiji Yang <yangshiji66@outlook.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 8a6156bd
Loading
Loading
Loading
Loading
+10 −13
Original line number Diff line number Diff line
@@ -210,19 +210,16 @@ void __init ltq_soc_init(void)
	of_node_put(np_syseth);
	of_node_put(np_sysgpe);

	if ((request_mem_region(res_status.start, resource_size(&res_status),
				res_status.name) < 0) ||
		(request_mem_region(res_ebu.start, resource_size(&res_ebu),
				res_ebu.name) < 0) ||
		(request_mem_region(res_sys[0].start,
				resource_size(&res_sys[0]),
				res_sys[0].name) < 0) ||
		(request_mem_region(res_sys[1].start,
				resource_size(&res_sys[1]),
				res_sys[1].name) < 0) ||
		(request_mem_region(res_sys[2].start,
				resource_size(&res_sys[2]),
				res_sys[2].name) < 0))
	if ((!request_mem_region(res_status.start, resource_size(&res_status),
				 res_status.name)) ||
	    (!request_mem_region(res_ebu.start, resource_size(&res_ebu),
				 res_ebu.name)) ||
	    (!request_mem_region(res_sys[0].start, resource_size(&res_sys[0]),
				 res_sys[0].name)) ||
	    (!request_mem_region(res_sys[1].start, resource_size(&res_sys[1]),
				 res_sys[1].name)) ||
	    (!request_mem_region(res_sys[2].start, resource_size(&res_sys[2]),
				 res_sys[2].name)))
		pr_err("Failed to request core resources");

	status_membase = ioremap(res_status.start,