Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcb82437 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: R-Car: Get rid of on_off_fn() function pointer 



Simplify the power request code by passing an "on" flag, and picking the
right status bit and register offset in the innermost function, based on
this flag.
This allows to remove the rcar_sysc_pwr_{off,on}() helper functions, and
the function pointer through which they were called.

Make sr_bit and reg_offs unsigned while we're at it.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 21437c53

arch/arm/mach-shmobile/pm-rcar.c

+14 −17
Original line number Original line Diff line number Diff line
@@ -51,11 +51,19 @@ 
static void __iomem *rcar_sysc_base;

static void __iomem *rcar_sysc_base;

static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */

static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */





static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch,

static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch, bool on)

				int sr_bit, int reg_offs)

{

{

	unsigned int sr_bit, reg_offs;

	int k;

	int k;





	if (on) {

		sr_bit = SYSCSR_PONENB;

		reg_offs = PWRONCR_OFFS;

	} else {

		sr_bit = SYSCSR_POFFENB;

		reg_offs = PWROFFCR_OFFS;

	}



	/* Wait until SYSC is ready to accept a power request */

	/* Wait until SYSC is ready to accept a power request */

	for (k = 0; k < SYSCSR_RETRIES; k++) {

	for (k = 0; k < SYSCSR_RETRIES; k++) {

		if (ioread32(rcar_sysc_base + SYSCSR) & BIT(sr_bit))

		if (ioread32(rcar_sysc_base + SYSCSR) & BIT(sr_bit))
@@ -73,18 +81,7 @@ static int rcar_sysc_pwr_on_off(const struct rcar_sysc_ch *sysc_ch, 
	return 0;

	return 0;

}

}





static int rcar_sysc_pwr_off(const struct rcar_sysc_ch *sysc_ch)

static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on)

{

	return rcar_sysc_pwr_on_off(sysc_ch, SYSCSR_POFFENB, PWROFFCR_OFFS);

}



static int rcar_sysc_pwr_on(const struct rcar_sysc_ch *sysc_ch)

{

	return rcar_sysc_pwr_on_off(sysc_ch, SYSCSR_PONENB, PWRONCR_OFFS);

}



static int rcar_sysc_update(const struct rcar_sysc_ch *sysc_ch,

			    int (*on_off_fn)(const struct rcar_sysc_ch *))

{

{

	unsigned int isr_mask = BIT(sysc_ch->isr_bit);

	unsigned int isr_mask = BIT(sysc_ch->isr_bit);

	unsigned int chan_mask = BIT(sysc_ch->chan_bit);

	unsigned int chan_mask = BIT(sysc_ch->chan_bit);
@@ -99,7 +96,7 @@ static int rcar_sysc_update(const struct rcar_sysc_ch *sysc_ch, 




	/* Submit power shutoff or resume request until it was accepted */

	/* Submit power shutoff or resume request until it was accepted */

	for (k = 0; k < PWRER_RETRIES; k++) {

	for (k = 0; k < PWRER_RETRIES; k++) {

		ret = on_off_fn(sysc_ch);

		ret = rcar_sysc_pwr_on_off(sysc_ch, on);

		if (ret)

		if (ret)

			goto out;

			goto out;
@@ -138,12 +135,12 @@ static int rcar_sysc_update(const struct rcar_sysc_ch *sysc_ch, 




int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch)

int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch)

{

{

	return rcar_sysc_update(sysc_ch, rcar_sysc_pwr_off);

	return rcar_sysc_power(sysc_ch, false);

}

}





int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch)

int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch)

{

{

	return rcar_sysc_update(sysc_ch, rcar_sysc_pwr_on);

	return rcar_sysc_power(sysc_ch, true);

}

}





bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)

bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)