mmc: sdhi, tmio: only check flags in tmio-mmc driver proper
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 15 Feb 2013 15:13:50 +0000 (16:13 +0100)
committerChris Ball <cjb@laptop.org>
Sun, 24 Feb 2013 19:37:18 +0000 (14:37 -0500)
tmio-mmc platform flags can be set by various means, including caller
drivers and device-tree bindings, therefore it is better to only check
them in the tmio-mmc driver proper, not in caller drivers themselves.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sh_mobile_sdhi.c
drivers/mmc/host/tmio_mmc_pio.c

index 524a7f77382049bffc39fd2c381a142c1309ce84..e0ca0abba0e58ce37114cc516a6ee8b1510344ef 100644 (file)
@@ -153,10 +153,9 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
        mmc_data->clk_enable = sh_mobile_sdhi_clk_enable;
        mmc_data->clk_disable = sh_mobile_sdhi_clk_disable;
        mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
+       mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
        if (p) {
                mmc_data->flags = p->tmio_flags;
-               if (mmc_data->flags & TMIO_MMC_HAS_IDLE_WAIT)
-                       mmc_data->write16_hook = sh_mobile_sdhi_write16_hook;
                mmc_data->ocr_mask = p->tmio_ocr_mask;
                mmc_data->capabilities |= p->tmio_caps;
                mmc_data->capabilities2 |= p->tmio_caps2;
index 0f992e9ffc736aa34f5b20c2bdd7f22a87f5a215..b25adb4160f5b32bc285d0df54ee928831eb6600 100644 (file)
@@ -928,6 +928,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host,
        int ret;
        u32 irq_mask = TMIO_MASK_CMD;
 
+       if (!(pdata->flags & TMIO_MMC_HAS_IDLE_WAIT))
+               pdata->write16_hook = NULL;
+
        res_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res_ctl)
                return -EINVAL;