| Message ID | 1510042172-27220-5-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/6] mmc: renesas_sdhc: remove eprobe jump label | expand |
On Tue, Nov 07, 2017 at 05:09:30PM +0900, Masahiro Yamada wrote: > Currently, tmio_mmc_ops is static data and tmio_mmc_host_probe() > updates some hooks in the static data. This is a problem when > two or more instances call tmio_mmc_host_probe() and each of them > requests to use its own card_busy/start_signal_voltage_switch. > > We can borrow a solution from sdhci_alloc_host(). Copy the whole > ops structure to host->mmc_host_ops, then override the hooks in > malloc'ed data. Constify tmio_mmc_ops since it is a template ops > used by default. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
2017-11-21 5:48 GMT+09:00 Wolfram Sang <wsa@the-dreams.de>: > >> + struct mmc_host_ops mmc_host_ops; > > Just came to think of it: maybe a shorter name? > > host->ops > > is still nicely readable, I'd think... > I just thought it should be clear which ops, but nobody would be confused with "dma_ops". OK, I will rename it to "ops" in v2. -- Best Regards Masahiro Yamada
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 3e6ff89..b251f1c 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -134,6 +134,7 @@ struct tmio_mmc_host { struct mmc_request *mrq; struct mmc_data *data; struct mmc_host *mmc; + struct mmc_host_ops mmc_host_ops; /* Callbacks for clock / power control */ void (*set_pwr)(struct platform_device *host, int state); diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 0db6cac..3c84044 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1098,7 +1098,7 @@ static int tmio_multi_io_quirk(struct mmc_card *card, return blk_size; } -static struct mmc_host_ops tmio_mmc_ops = { +static const struct mmc_host_ops tmio_mmc_ops = { .request = tmio_mmc_request, .set_ios = tmio_mmc_set_ios, .get_ro = tmio_mmc_get_ro, @@ -1155,6 +1155,8 @@ tmio_mmc_host_alloc(struct platform_device *pdev) host = mmc_priv(mmc); host->mmc = mmc; host->pdev = pdev; + host->mmc_host_ops = tmio_mmc_ops; + mmc->ops = &host->mmc_host_ops; return host; } @@ -1200,10 +1202,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, if (ret < 0) return ret; - tmio_mmc_ops.card_busy = _host->card_busy; - tmio_mmc_ops.start_signal_voltage_switch = + _host->mmc_host_ops.card_busy = _host->card_busy; + _host->mmc_host_ops.start_signal_voltage_switch = _host->start_signal_voltage_switch; - mmc->ops = &tmio_mmc_ops; mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2;
Currently, tmio_mmc_ops is static data and tmio_mmc_host_probe() updates some hooks in the static data. This is a problem when two or more instances call tmio_mmc_host_probe() and each of them requests to use its own card_busy/start_signal_voltage_switch. We can borrow a solution from sdhci_alloc_host(). Copy the whole ops structure to host->mmc_host_ops, then override the hooks in malloc'ed data. Constify tmio_mmc_ops since it is a template ops used by default. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) -- 2.7.4