mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 19:11:31 +00:00
mmc: tmio: tmio_mmc_host has .multi_io_quirk
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> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
00452c11ea
commit
85c02ddd59
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user