git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From 9c9a7ff9882fc6ba7d2f4050697e8bb80383e8dc Mon Sep 17 00:00:00 2001
   2 From: Shiji Yang <yangshiji66@outlook.com>
   3 Date: Wed, 18 Jun 2025 22:53:23 +0800
   4 Subject: [PATCH 11/11] MIPS: lantiq: falcon: sysctrl: fix request memory check
   5  logic
   6
   7 request_mem_region() will return NULL instead of error code
   8 when the memory request fails. Therefore, we should check if
   9 the return value is non-zero instead of less than zero. In
  10 this way, this patch also fixes the build warnings:
  11
  12 arch/mips/lantiq/falcon/sysctrl.c:214:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  13   214 |                                 res_status.name) < 0) ||
  14       |                                                  ^
  15 arch/mips/lantiq/falcon/sysctrl.c:216:47: error: ordered comparison of pointer with integer zero [-Werror=extra]
  16   216 |                                 res_ebu.name) < 0) ||
  17       |                                               ^
  18 arch/mips/lantiq/falcon/sysctrl.c:219:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  19   219 |                                 res_sys[0].name) < 0) ||
  20       |                                                  ^
  21 arch/mips/lantiq/falcon/sysctrl.c:222:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  22   222 |                                 res_sys[1].name) < 0) ||
  23       |                                                  ^
  24 arch/mips/lantiq/falcon/sysctrl.c:225:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
  25   225 |                                 res_sys[2].name) < 0))
  26       |
  27
  28 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
  29 Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  30 ---
  31  arch/mips/lantiq/falcon/sysctrl.c | 23 ++++++++++-------------
  32  1 file changed, 10 insertions(+), 13 deletions(-)
  33
  34 --- a/arch/mips/lantiq/falcon/sysctrl.c
  35 +++ b/arch/mips/lantiq/falcon/sysctrl.c
  36 @@ -210,19 +210,16 @@ void __init ltq_soc_init(void)
  37         of_node_put(np_syseth);
  38         of_node_put(np_sysgpe);
  39
  40 -       if ((request_mem_region(res_status.start, resource_size(&res_status),
  41 -                               res_status.name) < 0) ||
  42 -               (request_mem_region(res_ebu.start, resource_size(&res_ebu),
  43 -                               res_ebu.name) < 0) ||
  44 -               (request_mem_region(res_sys[0].start,
  45 -                               resource_size(&res_sys[0]),
  46 -                               res_sys[0].name) < 0) ||
  47 -               (request_mem_region(res_sys[1].start,
  48 -                               resource_size(&res_sys[1]),
  49 -                               res_sys[1].name) < 0) ||
  50 -               (request_mem_region(res_sys[2].start,
  51 -                               resource_size(&res_sys[2]),
  52 -                               res_sys[2].name) < 0))
  53 +       if ((!request_mem_region(res_status.start, resource_size(&res_status),
  54 +                                res_status.name)) ||
  55 +           (!request_mem_region(res_ebu.start, resource_size(&res_ebu),
  56 +                                res_ebu.name)) ||
  57 +           (!request_mem_region(res_sys[0].start, resource_size(&res_sys[0]),
  58 +                                res_sys[0].name)) ||
  59 +           (!request_mem_region(res_sys[1].start, resource_size(&res_sys[1]),
  60 +                                res_sys[1].name)) ||
  61 +           (!request_mem_region(res_sys[2].start, resource_size(&res_sys[2]),
  62 +                                res_sys[2].name)))
  63                 pr_err("Failed to request core resources");
  64
  65         status_membase = ioremap(res_status.start,