Skip to content

Commit 4133b1c

Browse files
committed
pmdomain: Merge branch fixes into next
Merge the pmdomain fixes for v6.15-rc[n] into the next branch, to allow them to get tested together with the new changes that are targeted for v6.16. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2 parents 54ce9aa + 13a6d42 commit 4133b1c

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

drivers/pmdomain/renesas/rcar-gen4-sysc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,6 @@ static int __init rcar_gen4_sysc_pd_init(void)
338338
struct rcar_gen4_sysc_pd *pd;
339339
size_t n;
340340

341-
if (!area->name) {
342-
/* Skip NULLified area */
343-
continue;
344-
}
345-
346341
n = strlen(area->name) + 1;
347342
pd = kzalloc(sizeof(*pd) + n, GFP_KERNEL);
348343
if (!pd) {

drivers/pmdomain/renesas/rcar-sysc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,6 @@ static int __init rcar_sysc_pd_init(void)
396396
struct rcar_sysc_pd *pd;
397397
size_t n;
398398

399-
if (!area->name) {
400-
/* Skip NULLified area */
401-
continue;
402-
}
403-
404399
n = strlen(area->name) + 1;
405400
pd = kzalloc(sizeof(*pd) + n, GFP_KERNEL);
406401
if (!pd) {

0 commit comments

Comments
 (0)