| From 374fc32c3ddab4d815ec3cd7144d3d30a3a5f828 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Mon, 12 Dec 2016 20:51:20 +0100 |
| Subject: [PATCH 145/255] mmc: sh_mobile_sdhi: simplify accessing DT data |
| |
| By using the helper of_device_get_match_data(), we can skip some |
| checking and make the code simpler. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit dc9f1a8d790ee766c47eca163261225680691e64) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mobile_sdhi.c | 14 ++++---------- |
| 1 file changed, 4 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -556,8 +556,7 @@ static void sh_mobile_sdhi_enable_dma(st |
| |
| static int sh_mobile_sdhi_probe(struct platform_device *pdev) |
| { |
| - const struct of_device_id *of_id = |
| - of_match_device(sh_mobile_sdhi_of_match, &pdev->dev); |
| + const struct sh_mobile_sdhi_of_data *of_data = of_device_get_match_data(&pdev->dev); |
| struct sh_mobile_sdhi *priv; |
| struct tmio_mmc_data *mmc_data; |
| struct tmio_mmc_data *mmd = pdev->dev.platform_data; |
| @@ -598,9 +597,8 @@ static int sh_mobile_sdhi_probe(struct p |
| goto eprobe; |
| } |
| |
| - if (of_id && of_id->data) { |
| - const struct sh_mobile_sdhi_of_data *of_data = of_id->data; |
| |
| + if (of_data) { |
| mmc_data->flags |= of_data->tmio_flags; |
| mmc_data->ocr_mask = of_data->tmio_ocr_mask; |
| mmc_data->capabilities |= of_data->capabilities; |
| @@ -671,14 +669,10 @@ static int sh_mobile_sdhi_probe(struct p |
| if (host->mmc->caps & MMC_CAP_UHS_SDR104) { |
| host->mmc->caps |= MMC_CAP_HW_RESET; |
| |
| - if (of_id && of_id->data) { |
| - const struct sh_mobile_sdhi_of_data *of_data; |
| - const struct sh_mobile_sdhi_scc *taps; |
| + if (of_data) { |
| + const struct sh_mobile_sdhi_scc *taps = of_data->taps; |
| bool hit = false; |
| |
| - of_data = of_id->data; |
| - taps = of_data->taps; |
| - |
| for (i = 0; i < of_data->taps_num; i++) { |
| if (taps[i].clk_rate == 0 || |
| taps[i].clk_rate == host->mmc->f_max) { |
