From: Lee Jones <lee.jones@linaro.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Chris Ball <cjb@laptop.org>, Simon <horms@verge.net.au>,
Linux-SH <linux-sh@vger.kernel.org>,
linux-mmc <linux-mmc@vger.kernel.org>
Subject: Re: [PATCH 06/17] mmc: tmio: tmio_mmc_host has .multi_io_quirk
Date: Tue, 20 Jan 2015 09:35:48 +0000 [thread overview]
Message-ID: <20150120093548.GF5767@x1> (raw)
In-Reply-To: <CAPDyKFpjYH_Txt1g8AjMFncnXvyT_-E5CKmdY+cDoNk+sC2ujg@mail.gmail.com>
On Tue, 20 Jan 2015, Ulf Hansson wrote:
> + MFD maintainer
>
> On 13 January 2015 at 05:58, Kuninori Morimoto
> <kuninori.morimoto.gx@renesas.com> wrote:
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > Current .multi_io_quirk is implemented under tmio_mmc_data.
> > It goes to tmio_mmc_host by this patch.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > drivers/mmc/host/sh_mobile_sdhi.c | 2 +-
> > drivers/mmc/host/tmio_mmc.h | 2 ++
> > drivers/mmc/host/tmio_mmc_pio.c | 5 ++---
> > include/linux/mfd/tmio.h | 3 ---
Acked-by: Lee Jones <lee.jones@linaro.org>
> > 4 files changed, 5 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> > index 5e02a6a..c92efe5 100644
> > --- a/drivers/mmc/host/sh_mobile_sdhi.c
> > +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> > @@ -217,9 +217,9 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
> > host->write16_hook = sh_mobile_sdhi_write16_hook;
> > host->clk_enable = sh_mobile_sdhi_clk_enable;
> > host->clk_disable = sh_mobile_sdhi_clk_disable;
> > + host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
> >
> > mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
> > - mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
> > if (p) {
> > mmc_data->flags = p->tmio_flags;
> > mmc_data->ocr_mask = p->tmio_ocr_mask;
> > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> > index 28234ec..263256c 100644
> > --- a/drivers/mmc/host/tmio_mmc.h
> > +++ b/drivers/mmc/host/tmio_mmc.h
> > @@ -98,6 +98,8 @@ struct tmio_mmc_host {
> > int (*write16_hook)(struct tmio_mmc_host *host, int addr);
> > int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
> > void (*clk_disable)(struct platform_device *pdev);
> > + int (*multi_io_quirk)(struct mmc_card *card,
> > + unsigned int direction, int blk_size);
> > };
> >
> > struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);
> > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
> > index 94fbf4a..67c8182 100644
> > --- a/drivers/mmc/host/tmio_mmc_pio.c
> > +++ b/drivers/mmc/host/tmio_mmc_pio.c
> > @@ -1004,10 +1004,9 @@ static int tmio_multi_io_quirk(struct mmc_card *card,
> > unsigned int direction, int blk_size)
> > {
> > struct tmio_mmc_host *host = mmc_priv(card->host);
> > - struct tmio_mmc_data *pdata = host->pdata;
> >
> > - if (pdata->multi_io_quirk)
> > - return pdata->multi_io_quirk(card, direction, blk_size);
> > + if (host->multi_io_quirk)
> > + return host->multi_io_quirk(card, direction, blk_size);
> >
> > return blk_size;
> > }
> > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> > index a3f78da..3edaa17 100644
> > --- a/include/linux/mfd/tmio.h
> > +++ b/include/linux/mfd/tmio.h
> > @@ -125,9 +125,6 @@ struct tmio_mmc_data {
> > unsigned int cd_gpio;
> > void (*set_pwr)(struct platform_device *host, int state);
> > void (*set_clk_div)(struct platform_device *host, int state);
> > -
> > - int (*multi_io_quirk)(struct mmc_card *card,
> > - unsigned int direction, int blk_size);
> > };
> >
> > /*
> >
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
WARNING: multiple messages have this Message-ID (diff)
From: Lee Jones <lee.jones@linaro.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Chris Ball <cjb@laptop.org>, Simon <horms@verge.net.au>,
Linux-SH <linux-sh@vger.kernel.org>,
linux-mmc <linux-mmc@vger.kernel.org>
Subject: Re: [PATCH 06/17] mmc: tmio: tmio_mmc_host has .multi_io_quirk
Date: Tue, 20 Jan 2015 09:35:48 +0000 [thread overview]
Message-ID: <20150120093548.GF5767@x1> (raw)
In-Reply-To: <CAPDyKFpjYH_Txt1g8AjMFncnXvyT_-E5CKmdY+cDoNk+sC2ujg@mail.gmail.com>
On Tue, 20 Jan 2015, Ulf Hansson wrote:
> + MFD maintainer
>
> On 13 January 2015 at 05:58, Kuninori Morimoto
> <kuninori.morimoto.gx@renesas.com> wrote:
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > Current .multi_io_quirk is implemented under tmio_mmc_data.
> > It goes to tmio_mmc_host by this patch.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > drivers/mmc/host/sh_mobile_sdhi.c | 2 +-
> > drivers/mmc/host/tmio_mmc.h | 2 ++
> > drivers/mmc/host/tmio_mmc_pio.c | 5 ++---
> > include/linux/mfd/tmio.h | 3 ---
Acked-by: Lee Jones <lee.jones@linaro.org>
> > 4 files changed, 5 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> > index 5e02a6a..c92efe5 100644
> > --- a/drivers/mmc/host/sh_mobile_sdhi.c
> > +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> > @@ -217,9 +217,9 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
> > host->write16_hook = sh_mobile_sdhi_write16_hook;
> > host->clk_enable = sh_mobile_sdhi_clk_enable;
> > host->clk_disable = sh_mobile_sdhi_clk_disable;
> > + host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
> >
> > mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
> > - mmc_data->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
> > if (p) {
> > mmc_data->flags = p->tmio_flags;
> > mmc_data->ocr_mask = p->tmio_ocr_mask;
> > diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> > index 28234ec..263256c 100644
> > --- a/drivers/mmc/host/tmio_mmc.h
> > +++ b/drivers/mmc/host/tmio_mmc.h
> > @@ -98,6 +98,8 @@ struct tmio_mmc_host {
> > int (*write16_hook)(struct tmio_mmc_host *host, int addr);
> > int (*clk_enable)(struct platform_device *pdev, unsigned int *f);
> > void (*clk_disable)(struct platform_device *pdev);
> > + int (*multi_io_quirk)(struct mmc_card *card,
> > + unsigned int direction, int blk_size);
> > };
> >
> > struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev);
> > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
> > index 94fbf4a..67c8182 100644
> > --- a/drivers/mmc/host/tmio_mmc_pio.c
> > +++ b/drivers/mmc/host/tmio_mmc_pio.c
> > @@ -1004,10 +1004,9 @@ static int tmio_multi_io_quirk(struct mmc_card *card,
> > unsigned int direction, int blk_size)
> > {
> > struct tmio_mmc_host *host = mmc_priv(card->host);
> > - struct tmio_mmc_data *pdata = host->pdata;
> >
> > - if (pdata->multi_io_quirk)
> > - return pdata->multi_io_quirk(card, direction, blk_size);
> > + if (host->multi_io_quirk)
> > + return host->multi_io_quirk(card, direction, blk_size);
> >
> > return blk_size;
> > }
> > diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> > index a3f78da..3edaa17 100644
> > --- a/include/linux/mfd/tmio.h
> > +++ b/include/linux/mfd/tmio.h
> > @@ -125,9 +125,6 @@ struct tmio_mmc_data {
> > unsigned int cd_gpio;
> > void (*set_pwr)(struct platform_device *host, int state);
> > void (*set_clk_div)(struct platform_device *host, int state);
> > -
> > - int (*multi_io_quirk)(struct mmc_card *card,
> > - unsigned int direction, int blk_size);
> > };
> >
> > /*
> >
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2015-01-20 9:35 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201501131902.WqokttpY%fengguang.wu@intel.com>
2015-01-13 4:56 ` [PATCH 0/17 v2] tmio: mmc: header cleanup / sh_mobile_cleanup Kuninori Morimoto
2015-01-13 4:57 ` [PATCH 01/17] mmc: tmio: add tmio_mmc_host_alloc/free() Kuninori Morimoto
2015-01-20 9:10 ` Ulf Hansson
2015-01-20 9:10 ` Ulf Hansson
2015-01-20 9:38 ` Lee Jones
2015-01-20 9:38 ` Lee Jones
2015-01-13 4:57 ` [PATCH 02/17] mmc: tmio: tmio_mmc_host has .dma Kuninori Morimoto
2015-01-20 9:10 ` Ulf Hansson
2015-01-20 9:10 ` Ulf Hansson
2015-01-20 9:37 ` Lee Jones
2015-01-20 9:37 ` Lee Jones
2015-01-13 4:57 ` [PATCH 03/17] mmc: tmio: tmio_mmc_host has .write16_hook Kuninori Morimoto
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:37 ` Lee Jones
2015-01-20 9:37 ` Lee Jones
2015-01-13 4:57 ` [PATCH 04/17] mmc: tmio: tmio_mmc_host has .clk_enable Kuninori Morimoto
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:36 ` Lee Jones
2015-01-20 9:36 ` Lee Jones
2015-01-13 4:58 ` [PATCH 05/17] mmc: tmio: tmio_mmc_host has .clk_disable Kuninori Morimoto
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:11 ` Ulf Hansson
2015-01-20 9:36 ` Lee Jones
2015-01-20 9:36 ` Lee Jones
2015-01-13 4:58 ` [PATCH 06/17] mmc: tmio: tmio_mmc_host has .multi_io_quirk Kuninori Morimoto
2015-01-20 9:12 ` Ulf Hansson
2015-01-20 9:12 ` Ulf Hansson
2015-01-20 9:35 ` Lee Jones [this message]
2015-01-20 9:35 ` Lee Jones
2015-01-13 4:58 ` [PATCH 07/17] mmc: tmio: tmio_mmc_host has .bus_shift Kuninori Morimoto
2015-01-20 9:12 ` Ulf Hansson
2015-01-20 9:12 ` Ulf Hansson
2015-01-20 9:35 ` Lee Jones
2015-01-20 9:35 ` Lee Jones
2015-01-13 4:58 ` [PATCH 08/17] mmc: tmio: tmio_mmc_data has .alignment_shift Kuninori Morimoto
2015-01-20 9:13 ` Ulf Hansson
2015-01-20 9:13 ` Ulf Hansson
2015-01-20 9:34 ` Lee Jones
2015-01-20 9:34 ` Lee Jones
2015-01-13 4:58 ` [PATCH 09/17] mmc: tmio: tmio_mmc_data has .dma_rx_offset Kuninori Morimoto
2015-01-20 9:13 ` Ulf Hansson
2015-01-20 9:13 ` Ulf Hansson
2015-01-20 9:34 ` Lee Jones
2015-01-20 9:34 ` Lee Jones
2015-01-13 4:59 ` [PATCH 10/17] mmc: tmio: add .enable_dma on tmio_mmc_data Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 11/17] mmc: tmio: enable SoC specific DMA buswidth settings Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 12/17] mmc: sh_mobile_sdhi: remove .init/.cleanup Kuninori Morimoto
2015-01-13 4:59 ` Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 13/17] mmc: sh_mobile_sdhi: tidyup mmc_data->bus_shift for latest SoC Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 14/17] mmc: sh_mobile_sdhi: add new macro for mmc_host to sh_mobile_sdhi Kuninori Morimoto
2015-01-13 4:59 ` [PATCH 15/17] mmc: sh_mobile_sdhi: use .enable_dma Kuninori Morimoto
2015-01-13 4:59 ` Kuninori Morimoto
2015-01-13 5:00 ` [PATCH 16/17] mmc: sh_mobile_sdhi: enable 32bit DMA access Kuninori Morimoto
2015-01-13 5:00 ` Kuninori Morimoto
2015-01-13 5:00 ` [PATCH 17/17] mmc: tmio: remove TMIO_MMC_HAVE_CTL_DMA_REG flag Kuninori Morimoto
2015-01-20 9:14 ` Ulf Hansson
2015-01-20 9:14 ` Ulf Hansson
2015-01-20 9:33 ` Lee Jones
2015-01-20 9:33 ` Lee Jones
2015-01-13 9:35 ` [PATCH 0/17 v2] tmio: mmc: header cleanup / sh_mobile_cleanup Ulf Hansson
2015-01-13 9:35 ` Ulf Hansson
2015-01-14 8:30 ` [PATCH] mmc: tmio: add missing EXPORT_SYMBOL for tmio_mmc_host_alloc/free Ulf Hansson
2015-01-14 8:30 ` Ulf Hansson
2015-01-14 8:57 ` Kuninori Morimoto
2015-01-20 9:15 ` Ulf Hansson
2015-01-20 9:15 ` Ulf Hansson
2015-01-20 9:09 ` [PATCH 0/17 v2] tmio: mmc: header cleanup / sh_mobile_cleanup Ulf Hansson
2015-01-20 9:09 ` Ulf Hansson
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=20150120093548.GF5767@x1 \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=cjb@laptop.org \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/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: link
Be 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.