From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> To: linux-mmc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms@verge.net.au>, Arnd Bergmann <arnd@arndb.de>, Guennadi Liakhovetski <g.liakhovetski@gmx.de> Subject: [PATCH v4 01/13] mmc: sdhi, tmio: only check flags in tmio-mmc driver proper Date: Fri, 15 Feb 2013 15:13:50 +0000 [thread overview] Message-ID: <1360941242-18153-2-git-send-email-g.liakhovetski@gmx.de> (raw) In-Reply-To: <1360941242-18153-1-git-send-email-g.liakhovetski@gmx.de> 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> --- drivers/mmc/host/sh_mobile_sdhi.c | 3 +-- drivers/mmc/host/tmio_mmc_pio.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 524a7f7..e0ca0ab 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -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; diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 0f992e9..b25adb4 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -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; -- 1.7.2.5
WARNING: multiple messages have this Message-ID (diff)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> To: linux-mmc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms@verge.net.au>, Arnd Bergmann <arnd@arndb.de>, Guennadi Liakhovetski <g.liakhovetski@gmx.de> Subject: [PATCH v4 01/13] mmc: sdhi, tmio: only check flags in tmio-mmc driver proper Date: Fri, 15 Feb 2013 16:13:50 +0100 [thread overview] Message-ID: <1360941242-18153-2-git-send-email-g.liakhovetski@gmx.de> (raw) In-Reply-To: <1360941242-18153-1-git-send-email-g.liakhovetski@gmx.de> 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> --- drivers/mmc/host/sh_mobile_sdhi.c | 3 +-- drivers/mmc/host/tmio_mmc_pio.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 524a7f7..e0ca0ab 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -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; diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 0f992e9..b25adb4 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -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; -- 1.7.2.5
next prev parent reply other threads:[~2013-02-15 15:13 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-02-15 15:13 [PATCH v4 00/13] mmc: core and driver DT and related development Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski [this message] 2013-02-15 15:13 ` [PATCH v4 01/13] mmc: sdhi, tmio: only check flags in tmio-mmc driver proper Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 02/13] mmc: detailed definition of CD and WP MMC line polarities in DT Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 03/13] mmc: provide a standard MMC device-tree binding parser centrally Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-16 6:05 ` Simon Horman 2013-02-16 6:05 ` Simon Horman 2013-02-16 10:54 ` Arnd Bergmann 2013-02-16 11:41 ` Simon Horman 2013-02-16 11:41 ` Simon Horman 2013-02-16 14:02 ` Guennadi Liakhovetski 2013-02-16 14:02 ` Guennadi Liakhovetski 2013-02-16 15:21 ` [PATCH v5 " Guennadi Liakhovetski 2013-02-16 15:21 ` Guennadi Liakhovetski 2013-02-16 16:58 ` Sascha Hauer 2013-02-16 16:58 ` Sascha Hauer 2013-02-17 7:52 ` Simon Horman 2013-02-17 7:52 ` Simon Horman 2013-02-17 7:58 ` Simon Horman 2013-02-17 7:58 ` Simon Horman 2013-02-18 8:54 ` Guennadi Liakhovetski 2013-02-18 8:54 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 04/13] mmc: (cosmetic) remove "extern" from function declarations Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 05/13] mmc: sh-mmcif: use mmc_of_parse() to parse standard MMC DT bindings Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 06/13] mmc: tmio-mmc: define device-tree bindings Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 07/13] mmc: tmio-mmc: parse " Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 08/13] mmc: sh_mobile_sdhi: remove unused .pdata field Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 09/13] mmc: sh_mobile_sdhi: use managed resource allocations Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:13 ` [PATCH v4 10/13] mmc: tmio: remove unused and deprecated symbols Guennadi Liakhovetski 2013-02-15 15:13 ` Guennadi Liakhovetski 2013-02-15 15:14 ` [PATCH v4 11/13] mmc: tmio: add support for the VccQ regulator Guennadi Liakhovetski 2013-02-15 15:14 ` Guennadi Liakhovetski 2013-02-15 15:14 ` [PATCH v4 12/13] mmc: add DT bindings for more MMC capability flags Guennadi Liakhovetski 2013-02-15 15:14 ` Guennadi Liakhovetski 2013-02-16 22:58 ` Sergei Shtylyov 2013-02-16 23:58 ` Sergei Shtylyov [not found] ` <51201D32.20006-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> 2013-02-18 8:52 ` Guennadi Liakhovetski 2013-02-18 8:52 ` Guennadi Liakhovetski 2013-06-06 1:55 ` Olof Johansson 2013-06-06 1:55 ` Olof Johansson 2013-02-15 15:14 ` [PATCH v4 13/13] mmc: tmio: add barriers to IO operations Guennadi Liakhovetski 2013-02-15 15:14 ` Guennadi Liakhovetski 2013-02-18 15:05 ` Arnd Bergmann 2013-02-18 15:56 ` Guennadi Liakhovetski 2013-02-18 15:56 ` Guennadi Liakhovetski 2013-02-18 16:34 ` Arnd Bergmann 2013-02-18 17:20 ` Guennadi Liakhovetski 2013-02-18 17:20 ` Guennadi Liakhovetski 2013-02-18 22:11 ` Arnd Bergmann [not found] ` <201302182211.46697.arnd-r2nGTMty4D4@public.gmane.org> 2013-02-19 21:59 ` Guennadi Liakhovetski 2013-02-19 21:59 ` Guennadi Liakhovetski 2013-02-16 2:26 ` [PATCH v4 00/13] mmc: core and driver DT and related development Simon Horman 2013-02-16 2:26 ` Simon Horman 2013-02-18 13:15 ` Chris Ball 2013-02-18 13:15 ` Chris Ball 2013-02-19 21:57 ` Guennadi Liakhovetski 2013-02-19 21:57 ` Guennadi Liakhovetski 2013-02-19 22:00 ` Chris Ball 2013-02-19 22:00 ` Chris Ball 2013-02-18 14:52 ` Arnd Bergmann 2013-02-19 19:20 ` Stephen Warren 2013-02-19 19:20 ` Stephen Warren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1360941242-18153-2-git-send-email-g.liakhovetski@gmx.de \ --to=g.liakhovetski@gmx.de \ --cc=arnd@arndb.de \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=horms@verge.net.au \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.