Commit 4133b1c4 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 54ce9aa5 13a6d426

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

+0 −5
Original line number Diff line number Diff line
@@ -338,11 +338,6 @@ static int __init rcar_gen4_sysc_pd_init(void) 
		struct rcar_gen4_sysc_pd *pd;

		size_t n;



		if (!area->name) {

			/* Skip NULLified area */

			continue;

		}



		n = strlen(area->name) + 1;

		pd = kzalloc(sizeof(*pd) + n, GFP_KERNEL);

		if (!pd) {

drivers/pmdomain/renesas/rcar-sysc.c

+0 −5
Original line number Diff line number Diff line
@@ -396,11 +396,6 @@ static int __init rcar_sysc_pd_init(void) 
		struct rcar_sysc_pd *pd;

		size_t n;



		if (!area->name) {

			/* Skip NULLified area */

			continue;

		}



		n = strlen(area->name) + 1;

		pd = kzalloc(sizeof(*pd) + n, GFP_KERNEL);

		if (!pd) {