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: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Mika Westerberg 2011-08-18 15:23:47 +03:00 коммит произвёл Chris Ball
Родитель 66506f7617
Коммит 08c14071fd
3 изменённых файлов: 11 добавлений и 11 удалений

Просмотреть файл

@ -133,7 +133,7 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
if (mrq->done) if (mrq->done)
mrq->done(mrq); 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; mrq->stop->mrq = mrq;
} }
} }
mmc_host_clk_ungate(host); mmc_host_clk_hold(host);
led_trigger_event(host->led, LED_FULL); led_trigger_event(host->led, LED_FULL);
host->ops->request(host, mrq); host->ops->request(host, mrq);
} }

Просмотреть файл

@ -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. * @host: host to ungate.
* *
* Makes sure the host ios.clock is restored to a non-zero value * Makes sure the host ios.clock is restored to a non-zero value
* past this call. Increase clock reference count and ungate clock * past this call. Increase clock reference count and ungate clock
* if we're the first user. * 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; 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. * @host: host to gate.
* *
* Calls the host driver with ios.clock set to zero as often as possible * 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 * in order to gate off hardware MCI clocks. Decrease clock reference
* count and schedule disabling of clock. * 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; 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)) if (cancel_work_sync(&host->clk_gate_work))
mmc_host_clk_gate_delayed(host); mmc_host_clk_gate_delayed(host);
if (host->clk_gated) if (host->clk_gated)
mmc_host_clk_ungate(host); mmc_host_clk_hold(host);
/* There should be only one user now */ /* There should be only one user now */
WARN_ON(host->clk_requests > 1); WARN_ON(host->clk_requests > 1);
} }

Просмотреть файл

@ -16,16 +16,16 @@ int mmc_register_host_class(void);
void mmc_unregister_host_class(void); void mmc_unregister_host_class(void);
#ifdef CONFIG_MMC_CLKGATE #ifdef CONFIG_MMC_CLKGATE
void mmc_host_clk_ungate(struct mmc_host *host); void mmc_host_clk_hold(struct mmc_host *host);
void mmc_host_clk_gate(struct mmc_host *host); void mmc_host_clk_release(struct mmc_host *host);
unsigned int mmc_host_clk_rate(struct mmc_host *host); unsigned int mmc_host_clk_rate(struct mmc_host *host);
#else #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)
{ {
} }