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

Commit 08c14071 authored by Mika Westerberg's avatar Mika Westerberg Committed by Chris Ball
Browse files

mmc: rename mmc_host_clk_{ungate|gate} to mmc_host_clk_{hold|release} 



As per suggestion by Linus Walleij:

  > If you think the names of the functions are confusing then
  > you may rename them, say like this:
  >
  > mmc_host_clk_ungate() -> mmc_host_clk_hold()
  > mmc_host_clk_gate() -> mmc_host_clk_release()
  >
  > Which would make the usecases more clear

(This is CC'd to stable@ because the next two patches, which fix
observable races, depend on it.)

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 66506f76

drivers/mmc/core/core.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) 
		if (mrq->done)

			mrq->done(mrq);



		mmc_host_clk_gate(host);

		mmc_host_clk_release(host);

	}

}
@@ -192,7 +192,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) 
			mrq->stop->mrq = mrq;

		}

	}

	mmc_host_clk_ungate(host);

	mmc_host_clk_hold(host);

	led_trigger_event(host->led, LED_FULL);

	host->ops->request(host, mrq);

}

drivers/mmc/core/host.c

+5 −5
Original line number Diff line number Diff line
@@ -119,14 +119,14 @@ static void mmc_host_clk_gate_work(struct work_struct *work) 
}



/**

 *	mmc_host_clk_ungate - ungate hardware MCI clocks

 *	mmc_host_clk_hold - ungate hardware MCI clocks

 *	@host: host to ungate.

 *

 *	Makes sure the host ios.clock is restored to a non-zero value

 *	past this call.	Increase clock reference count and ungate clock

 *	if we're the first user.

 */

void mmc_host_clk_ungate(struct mmc_host *host)

void mmc_host_clk_hold(struct mmc_host *host)

{

	unsigned long flags;
@@ -164,14 +164,14 @@ static bool mmc_host_may_gate_card(struct mmc_card *card) 
}



/**

 *	mmc_host_clk_gate - gate off hardware MCI clocks

 *	mmc_host_clk_release - gate off hardware MCI clocks

 *	@host: host to gate.

 *

 *	Calls the host driver with ios.clock set to zero as often as possible

 *	in order to gate off hardware MCI clocks. Decrease clock reference

 *	count and schedule disabling of clock.

 */

void mmc_host_clk_gate(struct mmc_host *host)

void mmc_host_clk_release(struct mmc_host *host)

{

	unsigned long flags;
@@ -231,7 +231,7 @@ static inline void mmc_host_clk_exit(struct mmc_host *host) 
	if (cancel_work_sync(&host->clk_gate_work))

		mmc_host_clk_gate_delayed(host);

	if (host->clk_gated)

		mmc_host_clk_ungate(host);

		mmc_host_clk_hold(host);

	/* There should be only one user now */

	WARN_ON(host->clk_requests > 1);

}

drivers/mmc/core/host.h

+4 −4
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ int mmc_register_host_class(void); 
void mmc_unregister_host_class(void);



#ifdef CONFIG_MMC_CLKGATE

void mmc_host_clk_ungate(struct mmc_host *host);

void mmc_host_clk_gate(struct mmc_host *host);

void mmc_host_clk_hold(struct mmc_host *host);

void mmc_host_clk_release(struct mmc_host *host);

unsigned int mmc_host_clk_rate(struct mmc_host *host);



#else

static inline void mmc_host_clk_ungate(struct mmc_host *host)

static inline void mmc_host_clk_hold(struct mmc_host *host)

{

}



static inline void mmc_host_clk_gate(struct mmc_host *host)

static inline void mmc_host_clk_release(struct mmc_host *host)

{

}