* [PATCH v4 01/13] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 02/13] mmc: sdhci-esdhc-imx: " Jisheng Zhang
` (12 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates sdhci-bcm2835
to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-bcm2835.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index 1c65d46..4a6a1d1 100644
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -74,7 +74,7 @@ static inline u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg)
static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct bcm2835_sdhci *bcm2835_host = pltfm_host->priv;
+ struct bcm2835_sdhci *bcm2835_host = sdhci_pltfm_priv(pltfm_host);
u32 oldval = (reg == SDHCI_COMMAND) ? bcm2835_host->shadow :
bcm2835_sdhci_readl(host, reg & ~3);
u32 word_num = (reg >> 1) & 1;
@@ -152,20 +152,12 @@ static int bcm2835_sdhci_probe(struct platform_device *pdev)
struct sdhci_pltfm_host *pltfm_host;
int ret;
- host = sdhci_pltfm_init(pdev, &bcm2835_sdhci_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &bcm2835_sdhci_pdata,
+ sizeof(*bcm2835_host));
if (IS_ERR(host))
return PTR_ERR(host);
- bcm2835_host = devm_kzalloc(&pdev->dev, sizeof(*bcm2835_host),
- GFP_KERNEL);
- if (!bcm2835_host) {
- dev_err(mmc_dev(host->mmc),
- "failed to allocate bcm2835_sdhci\n");
- return -ENOMEM;
- }
-
pltfm_host = sdhci_priv(host);
- pltfm_host->priv = bcm2835_host;
pltfm_host->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pltfm_host->clk)) {
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 02/13] mmc: sdhci-esdhc-imx: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 01/13] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 03/13] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host Jisheng Zhang
` (11 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the sdhci
esdhc-imx driver to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-esdhc-imx.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index f25f292..2d300d8 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -260,7 +260,7 @@ static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, i
static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
u32 val = readl(host->ioaddr + reg);
if (unlikely(reg == SDHCI_PRESENT_STATE)) {
@@ -338,7 +338,7 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
u32 data;
if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
@@ -388,7 +388,7 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
u16 ret = 0;
u32 val;
@@ -448,7 +448,7 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
u32 new_val = 0;
switch (reg) {
@@ -556,7 +556,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
u32 new_val;
u32 mask;
@@ -633,7 +633,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
unsigned int clock)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
unsigned int host_clock = pltfm_host->clock;
int pre_div = 2;
int div = 1;
@@ -692,7 +692,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
struct esdhc_platform_data *boarddata = &imx_data->boarddata;
switch (boarddata->wp_type) {
@@ -794,7 +794,7 @@ static int esdhc_change_pinstate(struct sdhci_host *host,
unsigned int uhs)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
struct pinctrl_state *pinctrl;
dev_dbg(mmc_dev(host->mmc), "change pinctrl state for uhs %d\n", uhs);
@@ -864,7 +864,7 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing)
{
u32 m;
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
struct esdhc_platform_data *boarddata = &imx_data->boarddata;
/* disable ddr mode and disable HS400 mode */
@@ -917,7 +917,7 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)
static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
}
@@ -925,7 +925,7 @@ static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
static void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
/* use maximum timeout counter */
sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
@@ -1100,21 +1100,17 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
int err;
struct pltfm_imx_data *imx_data;
- host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_esdhc_imx_pdata,
+ sizeof(*imx_data));
if (IS_ERR(host))
return PTR_ERR(host);
pltfm_host = sdhci_priv(host);
- imx_data = devm_kzalloc(&pdev->dev, sizeof(*imx_data), GFP_KERNEL);
- if (!imx_data) {
- err = -ENOMEM;
- goto free_sdhci;
- }
+ imx_data = sdhci_pltfm_priv(pltfm_host);
imx_data->socdata = of_id ? of_id->data : (struct esdhc_soc_data *)
pdev->id_entry->driver_data;
- pltfm_host->priv = imx_data;
imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
if (IS_ERR(imx_data->clk_ipg)) {
@@ -1241,7 +1237,7 @@ static int sdhci_esdhc_imx_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
pm_runtime_get_sync(&pdev->dev);
@@ -1264,7 +1260,7 @@ static int sdhci_esdhc_runtime_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
int ret;
ret = sdhci_runtime_suspend_host(host);
@@ -1282,7 +1278,7 @@ static int sdhci_esdhc_runtime_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
+ struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
if (!sdhci_sdio_irq_enabled(host)) {
clk_prepare_enable(imx_data->clk_per);
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 03/13] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 01/13] mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 02/13] mmc: sdhci-esdhc-imx: " Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 04/13] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation Jisheng Zhang
` (10 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
There's no need to allocate one sdhci_msm_pdata for each sdhci_msm_host.
This patch removes the sdhci_msm_pdata member from sdhci_msm_host and
uses one static global sdhci_msm_pdata for all sdhci msm hosts. It also
marks sdhci_msm_ops as const.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/mmc/host/sdhci-msm.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 4695bee..ffac9b4 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -60,7 +60,6 @@ struct sdhci_msm_host {
struct clk *pclk; /* SDHC peripheral bus clock */
struct clk *bus_clk; /* SDHC bus voter clock */
struct mmc_host *mmc;
- struct sdhci_pltfm_data sdhci_msm_pdata;
};
/* Platform specific tuning */
@@ -418,7 +417,7 @@ static const struct of_device_id sdhci_msm_dt_match[] = {
MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
-static struct sdhci_ops sdhci_msm_ops = {
+static const struct sdhci_ops sdhci_msm_ops = {
.platform_execute_tuning = sdhci_msm_execute_tuning,
.reset = sdhci_reset,
.set_clock = sdhci_set_clock,
@@ -426,6 +425,12 @@ static struct sdhci_ops sdhci_msm_ops = {
.set_uhs_signaling = sdhci_set_uhs_signaling,
};
+static const struct sdhci_pltfm_data sdhci_msm_pdata = {
+ .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
+ SDHCI_QUIRK_SINGLE_POWER_WRITE,
+ .ops = &sdhci_msm_ops,
+};
+
static int sdhci_msm_probe(struct platform_device *pdev)
{
struct sdhci_host *host;
@@ -441,8 +446,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
if (!msm_host)
return -ENOMEM;
- msm_host->sdhci_msm_pdata.ops = &sdhci_msm_ops;
- host = sdhci_pltfm_init(pdev, &msm_host->sdhci_msm_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_msm_pdata, 0);
if (IS_ERR(host))
return PTR_ERR(host);
@@ -522,9 +526,6 @@ static int sdhci_msm_probe(struct platform_device *pdev)
/* Set HC_MODE_EN bit in HC_MODE register */
writel_relaxed(HC_MODE_EN, (msm_host->core_mem + CORE_HC_MODE));
- host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
- host->quirks |= SDHCI_QUIRK_SINGLE_POWER_WRITE;
-
host_version = readw_relaxed((host->ioaddr + SDHCI_HOST_VERSION));
dev_dbg(&pdev->dev, "Host Version: 0x%x Vendor Version 0x%x\n",
host_version, ((host_version & SDHCI_VENDOR_VER_MASK) >>
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 04/13] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (2 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 03/13] mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 05/13] mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove() Jisheng Zhang
` (9 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates sdhci-msm
to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-msm.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index ffac9b4..0653fe7 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -442,16 +442,12 @@ static int sdhci_msm_probe(struct platform_device *pdev)
u32 core_version, caps;
u8 core_major;
- msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
- if (!msm_host)
- return -ENOMEM;
-
- host = sdhci_pltfm_init(pdev, &sdhci_msm_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_msm_pdata, sizeof(*msm_host));
if (IS_ERR(host))
return PTR_ERR(host);
pltfm_host = sdhci_priv(host);
- pltfm_host->priv = msm_host;
+ msm_host = sdhci_pltfm_priv(pltfm_host);
msm_host->mmc = host->mmc;
msm_host->pdev = pdev;
@@ -571,16 +567,16 @@ static int sdhci_msm_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_msm_host *msm_host = pltfm_host->priv;
+ struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
int dead = (readl_relaxed(host->ioaddr + SDHCI_INT_STATUS) ==
0xffffffff);
sdhci_remove_host(host, dead);
- sdhci_pltfm_free(pdev);
clk_disable_unprepare(msm_host->clk);
clk_disable_unprepare(msm_host->pclk);
if (!IS_ERR(msm_host->bus_clk))
clk_disable_unprepare(msm_host->bus_clk);
+ sdhci_pltfm_free(pdev);
return 0;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 05/13] mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove()
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (3 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 04/13] mmc: sdhci-msm: use sdhci_pltfm_init for private allocation Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 18:30 ` Sören Brinkmann
2016-01-26 10:15 ` [PATCH v4 06/13] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation Jisheng Zhang
` (8 subsequent siblings)
13 siblings, 1 reply; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
sdhci_pltfm_unregister() could operate host's registers, it will cause
problems if the clk is already disabled and unprepared. Fix this issue
by moving the clk_disable_unprepare() call to the end of remove
function.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
drivers/mmc/host/sdhci-of-arasan.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 75379cb..50eb8bc 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -206,13 +206,16 @@ clk_dis_ahb:
static int sdhci_arasan_remove(struct platform_device *pdev)
{
+ int ret;
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;
+ ret = sdhci_pltfm_unregister(pdev);
+
clk_disable_unprepare(sdhci_arasan->clk_ahb);
- return sdhci_pltfm_unregister(pdev);
+ return ret;
}
static const struct of_device_id sdhci_arasan_of_match[] = {
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 06/13] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (4 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 05/13] mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove() Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 07/13] mmc: sdhci-of-at91: " Jisheng Zhang
` (7 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the
sdhci-of-arasan driver to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-of-arasan.c | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 50eb8bc..84c8fde 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -81,7 +81,7 @@ static int sdhci_arasan_suspend(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;
+ struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
int ret;
ret = sdhci_suspend_host(host);
@@ -106,7 +106,7 @@ static int sdhci_arasan_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;
+ struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
int ret;
ret = clk_enable(sdhci_arasan->clk_ahb);
@@ -137,10 +137,13 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
struct sdhci_pltfm_host *pltfm_host;
struct sdhci_arasan_data *sdhci_arasan;
- sdhci_arasan = devm_kzalloc(&pdev->dev, sizeof(*sdhci_arasan),
- GFP_KERNEL);
- if (!sdhci_arasan)
- return -ENOMEM;
+ host = sdhci_pltfm_init(pdev, &sdhci_arasan_pdata,
+ sizeof(*sdhci_arasan));
+ if (IS_ERR(host))
+ return PTR_ERR(host);
+
+ pltfm_host = sdhci_priv(host);
+ sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
sdhci_arasan->clk_ahb = devm_clk_get(&pdev->dev, "clk_ahb");
if (IS_ERR(sdhci_arasan->clk_ahb)) {
@@ -166,20 +169,12 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
goto clk_dis_ahb;
}
- host = sdhci_pltfm_init(pdev, &sdhci_arasan_pdata, 0);
- if (IS_ERR(host)) {
- ret = PTR_ERR(host);
- goto clk_disable_all;
- }
-
if (of_device_is_compatible(pdev->dev.of_node, "arasan,sdhci-4.9a")) {
host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT;
host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
}
sdhci_get_of_property(pdev);
- pltfm_host = sdhci_priv(host);
- pltfm_host->priv = sdhci_arasan;
pltfm_host->clk = clk_xin;
ret = mmc_of_parse(host->mmc);
@@ -209,11 +204,12 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
int ret;
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv;
+ struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);
+ struct clk *clk_ahb = sdhci_arasan->clk_ahb;
ret = sdhci_pltfm_unregister(pdev);
- clk_disable_unprepare(sdhci_arasan->clk_ahb);
+ clk_disable_unprepare(clk_ahb);
return ret;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 07/13] mmc: sdhci-of-at91: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (5 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 06/13] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 08/13] mmc: sdhci-of-esdhc: " Jisheng Zhang
` (6 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the
sdhci-of-at91 driver to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
drivers/mmc/host/sdhci-of-at91.c | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index 7e7d8f0..7db7163 100644
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -58,7 +58,7 @@ static int sdhci_at91_runtime_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_at91_priv *priv = pltfm_host->priv;
+ struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
int ret;
ret = sdhci_runtime_suspend_host(host);
@@ -74,7 +74,7 @@ static int sdhci_at91_runtime_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_at91_priv *priv = pltfm_host->priv;
+ struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
int ret;
ret = clk_prepare_enable(priv->mainck);
@@ -124,11 +124,12 @@ static int sdhci_at91_probe(struct platform_device *pdev)
return -EINVAL;
soc_data = match->data;
- priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
- if (!priv) {
- dev_err(&pdev->dev, "unable to allocate private data\n");
- return -ENOMEM;
- }
+ host = sdhci_pltfm_init(pdev, soc_data, sizeof(*priv));
+ if (IS_ERR(host))
+ return PTR_ERR(host);
+
+ pltfm_host = sdhci_priv(host);
+ priv = sdhci_pltfm_priv(pltfm_host);
priv->mainck = devm_clk_get(&pdev->dev, "baseclk");
if (IS_ERR(priv->mainck)) {
@@ -148,10 +149,6 @@ static int sdhci_at91_probe(struct platform_device *pdev)
return PTR_ERR(priv->gck);
}
- host = sdhci_pltfm_init(pdev, soc_data, 0);
- if (IS_ERR(host))
- return PTR_ERR(host);
-
/*
* The mult clock is provided by as a generated clock by the PMC
* controller. In order to set the rate of gck, we have to get the
@@ -191,9 +188,6 @@ static int sdhci_at91_probe(struct platform_device *pdev)
clk_prepare_enable(priv->mainck);
clk_prepare_enable(priv->gck);
- pltfm_host = sdhci_priv(host);
- pltfm_host->priv = priv;
-
ret = mmc_of_parse(host->mmc);
if (ret)
goto clocks_disable_unprepare;
@@ -230,7 +224,10 @@ static int sdhci_at91_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_at91_priv *priv = pltfm_host->priv;
+ struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
+ struct clk *gck = priv->gck;
+ struct clk *hclock = priv->hclock;
+ struct clk *mainck = priv->mainck;
pm_runtime_get_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
@@ -238,9 +235,9 @@ static int sdhci_at91_remove(struct platform_device *pdev)
sdhci_pltfm_unregister(pdev);
- clk_disable_unprepare(priv->gck);
- clk_disable_unprepare(priv->hclock);
- clk_disable_unprepare(priv->mainck);
+ clk_disable_unprepare(gck);
+ clk_disable_unprepare(hclock);
+ clk_disable_unprepare(mainck);
return 0;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 08/13] mmc: sdhci-of-esdhc: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (6 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 07/13] mmc: sdhci-of-at91: " Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 09/13] mmc: sdhci-pxav3: " Jisheng Zhang
` (5 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the
sdhci-of-esdhc driver to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-of-esdhc.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 83b1226..3f34d35 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -49,7 +49,7 @@ static u32 esdhc_readl_fixup(struct sdhci_host *host,
int spec_reg, u32 value)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = pltfm_host->priv;
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
u32 ret;
/*
@@ -354,7 +354,7 @@ static void esdhc_le_writeb(struct sdhci_host *host, u8 val, int reg)
static void esdhc_of_adma_workaround(struct sdhci_host *host, u32 intmask)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = pltfm_host->priv;
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
bool applicable;
dma_addr_t dmastart;
dma_addr_t dmanow;
@@ -404,7 +404,7 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_esdhc *esdhc = pltfm_host->priv;
+ struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
int pre_div = 1;
int div = 1;
u32 temp;
@@ -569,15 +569,12 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host)
u16 host_ver;
pltfm_host = sdhci_priv(host);
- esdhc = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_esdhc),
- GFP_KERNEL);
+ esdhc = sdhci_pltfm_priv(pltfm_host);
host_ver = sdhci_readw(host, SDHCI_HOST_VERSION);
esdhc->vendor_ver = (host_ver & SDHCI_VENDOR_VER_MASK) >>
SDHCI_VENDOR_VER_SHIFT;
esdhc->spec_ver = host_ver & SDHCI_SPEC_VER_MASK;
-
- pltfm_host->priv = esdhc;
}
static int sdhci_esdhc_probe(struct platform_device *pdev)
@@ -591,9 +588,11 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
np = pdev->dev.of_node;
if (of_get_property(np, "little-endian", NULL))
- host = sdhci_pltfm_init(pdev, &sdhci_esdhc_le_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_esdhc_le_pdata,
+ sizeof(struct sdhci_esdhc));
else
- host = sdhci_pltfm_init(pdev, &sdhci_esdhc_be_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_esdhc_be_pdata,
+ sizeof(struct sdhci_esdhc));
if (IS_ERR(host))
return PTR_ERR(host);
@@ -603,7 +602,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
sdhci_get_of_property(pdev);
pltfm_host = sdhci_priv(host);
- esdhc = pltfm_host->priv;
+ esdhc = sdhci_pltfm_priv(pltfm_host);
if (esdhc->vendor_ver == VENDOR_V_22)
host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 09/13] mmc: sdhci-pxav3: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (7 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 08/13] mmc: sdhci-of-esdhc: " Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 10/13] mmc: sdhci-st: " Jisheng Zhang
` (4 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates sdhci-pxav3
to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-pxav3.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index f5edf9d..c88d2ba 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -132,7 +132,7 @@ static int armada_38x_quirks(struct platform_device *pdev,
{
struct device_node *np = pdev->dev.of_node;
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = pltfm_host->priv;
+ struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
struct resource *res;
host->quirks &= ~SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN;
@@ -201,7 +201,7 @@ static void pxav3_reset(struct sdhci_host *host, u8 mask)
static void pxav3_gen_init_74_clocks(struct sdhci_host *host, u8 power_mode)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = pltfm_host->priv;
+ struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
u16 tmp;
int count;
@@ -250,7 +250,7 @@ static void pxav3_gen_init_74_clocks(struct sdhci_host *host, u8 power_mode)
static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = pltfm_host->priv;
+ struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
u16 ctrl_2;
/*
@@ -370,16 +370,12 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
const struct of_device_id *match;
int ret;
- pxa = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_pxa), GFP_KERNEL);
- if (!pxa)
- return -ENOMEM;
-
- host = sdhci_pltfm_init(pdev, &sdhci_pxav3_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_pxav3_pdata, sizeof(*pxa));
if (IS_ERR(host))
return PTR_ERR(host);
pltfm_host = sdhci_priv(host);
- pltfm_host->priv = pxa;
+ pxa = sdhci_pltfm_priv(pltfm_host);
pxa->clk_io = devm_clk_get(dev, "io");
if (IS_ERR(pxa->clk_io))
@@ -486,7 +482,7 @@ static int sdhci_pxav3_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = pltfm_host->priv;
+ struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
pm_runtime_get_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
@@ -535,7 +531,7 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = pltfm_host->priv;
+ struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
int ret;
ret = sdhci_runtime_suspend_host(host);
@@ -553,7 +549,7 @@ static int sdhci_pxav3_runtime_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = pltfm_host->priv;
+ struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
clk_prepare_enable(pxa->clk_io);
if (!IS_ERR(pxa->clk_core))
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 10/13] mmc: sdhci-st: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (8 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 09/13] mmc: sdhci-pxav3: " Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 11/13] mmc: sdhci-tegra: " Jisheng Zhang
` (3 subsequent siblings)
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates sdhci-st
to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-st.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c
index 969c2b0..320e1c2 100644
--- a/drivers/mmc/host/sdhci-st.c
+++ b/drivers/mmc/host/sdhci-st.c
@@ -251,7 +251,7 @@ static int sdhci_st_set_dll_for_clock(struct sdhci_host *host)
{
int ret = 0;
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct st_mmc_platform_data *pdata = pltfm_host->priv;
+ struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
if (host->clock > CLK_TO_CHECK_DLL_LOCK) {
st_mmcss_set_dll(pdata->top_ioaddr);
@@ -265,7 +265,7 @@ static void sdhci_st_set_uhs_signaling(struct sdhci_host *host,
unsigned int uhs)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct st_mmc_platform_data *pdata = pltfm_host->priv;
+ struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
u16 ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
int ret = 0;
@@ -357,10 +357,7 @@ static int sdhci_st_probe(struct platform_device *pdev)
int ret = 0;
u16 host_version;
struct resource *res;
-
- pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
- if (!pdata)
- return -ENOMEM;
+ struct reset_control *rstc;
clk = devm_clk_get(&pdev->dev, "mmc");
if (IS_ERR(clk)) {
@@ -368,19 +365,23 @@ static int sdhci_st_probe(struct platform_device *pdev)
return PTR_ERR(clk);
}
- pdata->rstc = devm_reset_control_get(&pdev->dev, NULL);
- if (IS_ERR(pdata->rstc))
- pdata->rstc = NULL;
+ rstc = devm_reset_control_get(&pdev->dev, NULL);
+ if (IS_ERR(rstc))
+ rstc = NULL;
else
- reset_control_deassert(pdata->rstc);
+ reset_control_deassert(rstc);
- host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, 0);
+ host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, sizeof(*pdata));
if (IS_ERR(host)) {
dev_err(&pdev->dev, "Failed sdhci_pltfm_init\n");
ret = PTR_ERR(host);
goto err_pltfm_init;
}
+ pltfm_host = sdhci_priv(host);
+ pdata = sdhci_pltfm_priv(pltfm_host);
+ pdata->rstc = rstc;
+
ret = mmc_of_parse(host->mmc);
if (ret) {
dev_err(&pdev->dev, "Failed mmc_of_parse\n");
@@ -398,8 +399,6 @@ static int sdhci_st_probe(struct platform_device *pdev)
pdata->top_ioaddr = NULL;
}
- pltfm_host = sdhci_priv(host);
- pltfm_host->priv = pdata;
pltfm_host->clk = clk;
/* Configure the Arasan HC inside the flashSS */
@@ -427,8 +426,8 @@ err_out:
err_of:
sdhci_pltfm_free(pdev);
err_pltfm_init:
- if (pdata->rstc)
- reset_control_assert(pdata->rstc);
+ if (rstc)
+ reset_control_assert(rstc);
return ret;
}
@@ -437,13 +436,14 @@ static int sdhci_st_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct st_mmc_platform_data *pdata = pltfm_host->priv;
+ struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
+ struct reset_control *rstc = pdata->rstc;
int ret;
ret = sdhci_pltfm_unregister(pdev);
- if (pdata->rstc)
- reset_control_assert(pdata->rstc);
+ if (rstc)
+ reset_control_assert(rstc);
return ret;
}
@@ -453,7 +453,7 @@ static int sdhci_st_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct st_mmc_platform_data *pdata = pltfm_host->priv;
+ struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
int ret = sdhci_suspend_host(host);
if (ret)
@@ -471,7 +471,7 @@ static int sdhci_st_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct st_mmc_platform_data *pdata = pltfm_host->priv;
+ struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
struct device_node *np = dev->of_node;
clk_prepare_enable(pltfm_host->clk);
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 11/13] mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (9 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 10/13] mmc: sdhci-st: " Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-27 15:14 ` Thierry Reding
2016-01-26 10:15 ` [PATCH v4 12/13] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang
` (2 subsequent siblings)
13 siblings, 1 reply; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register")
allows users of sdhci_pltfm to allocate private space in calls to
sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates sdhci-tegra
to this allocation.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-tegra.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 83c4bf7..2c3c57b 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -63,7 +63,7 @@ struct sdhci_tegra {
static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
if (unlikely((soc_data->nvquirks & NVQUIRK_FORCE_SDHCI_SPEC_200) &&
@@ -99,7 +99,7 @@ static void tegra_sdhci_writew(struct sdhci_host *host, u16 val, int reg)
static void tegra_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
/* Seems like we're getting spurious timeout and crc errors, so
@@ -131,7 +131,7 @@ static unsigned int tegra_sdhci_get_ro(struct sdhci_host *host)
static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
u32 misc_ctrl, clk_ctrl;
@@ -184,7 +184,7 @@ static void tegra_sdhci_set_bus_width(struct sdhci_host *host, int bus_width)
static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
unsigned long host_clk;
if (!clock)
@@ -201,7 +201,7 @@ static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,
unsigned timing)
{
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_tegra *tegra_host = pltfm_host->priv;
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
if (timing == MMC_TIMING_UHS_DDR50)
tegra_host->ddr_signaling = true;
@@ -380,20 +380,14 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
return -EINVAL;
soc_data = match->data;
- host = sdhci_pltfm_init(pdev, soc_data->pdata, 0);
+ host = sdhci_pltfm_init(pdev, soc_data->pdata, sizeof(*tegra_host));
if (IS_ERR(host))
return PTR_ERR(host);
pltfm_host = sdhci_priv(host);
- tegra_host = devm_kzalloc(&pdev->dev, sizeof(*tegra_host), GFP_KERNEL);
- if (!tegra_host) {
- dev_err(mmc_dev(host->mmc), "failed to allocate tegra_host\n");
- rc = -ENOMEM;
- goto err_alloc_tegra_host;
- }
+ tegra_host = sdhci_pltfm_priv(pltfm_host);
tegra_host->ddr_signaling = false;
tegra_host->soc_data = soc_data;
- pltfm_host->priv = tegra_host;
rc = mmc_of_parse(host->mmc);
if (rc)
@@ -429,7 +423,6 @@ err_add_host:
err_clk_get:
err_power_req:
err_parse_dt:
-err_alloc_tegra_host:
sdhci_pltfm_free(pdev);
return rc;
}
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 12/13] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (10 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 11/13] mmc: sdhci-tegra: " Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-01-26 10:15 ` [PATCH v4 13/13] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host Jisheng Zhang
2016-02-04 10:38 ` [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Ulf Hansson
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
The sdhci_pltfm_init() function has initialized the priv member as
NULL, so there's no need to do it again.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-pxav2.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index beffd86..1d8dd35 100644
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -177,7 +177,6 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
return PTR_ERR(host);
pltfm_host = sdhci_priv(host);
- pltfm_host->priv = NULL;
clk = clk_get(dev, "PXA-SDHCLK");
if (IS_ERR(clk)) {
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 13/13] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (11 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 12/13] mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv Jisheng Zhang
@ 2016-01-26 10:15 ` Jisheng Zhang
2016-02-04 10:38 ` [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Ulf Hansson
13 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-01-26 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Now all clients migration to use sdhci_pltfm_init for private
allocation is done and there's no users of the priv variable, so we can
remove it from the sdhci_pltfm_host structure.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/mmc/host/sdhci-pltfm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
index 04bc248..d38053b 100644
--- a/drivers/mmc/host/sdhci-pltfm.h
+++ b/drivers/mmc/host/sdhci-pltfm.h
@@ -23,7 +23,6 @@ struct sdhci_pltfm_data {
struct sdhci_pltfm_host {
struct clk *clk;
- void *priv; /* to handle quirks across io-accessor calls */
/* migrate from sdhci_of_host */
unsigned int clock;
--
2.7.0
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up
2016-01-26 10:15 [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Jisheng Zhang
` (12 preceding siblings ...)
2016-01-26 10:15 ` [PATCH v4 13/13] mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host Jisheng Zhang
@ 2016-02-04 10:38 ` Ulf Hansson
2016-02-08 14:09 ` Adrian Hunter
13 siblings, 1 reply; 19+ messages in thread
From: Ulf Hansson @ 2016-02-04 10:38 UTC (permalink / raw)
To: linux-arm-kernel
+ Adrian
On 26 January 2016 at 11:15, Jisheng Zhang <jszhang@marvell.com> wrote:
> These patches are to complete the TODOs in Commit 0e748234293f ("mmc:
> sdhci: Add size for caller in init+register"), I.E:
>
> - todo: migrate clients to using allocation this way
> - todo: remove priv variable once migration is complete
>
> Since v3:
> - based on v4.5-rc1
> - add Ludovic's ack for sdhci-of-at91 changes
> - fix use-after-free in some drivers: some host drivers still needs to
> access sdhci_pltfm_host->private after sdhci_pltfm_unregister(), but
> the private should be already freed by sdhci_pltfm_unregister.
> - add patch5 to fix one clk bug in sdhci_arasan_remove(). IMHO, It's
> better to add this patch to fixes rather than waiting for next merge
> window
>
> Since v2:
> - based on mmc next tree and remove all priv usage introduced in newly
> commits in this tree
> - don't break two lines if sdhci_pltfm_init() call could be put into
> one line. Thank Ludovic Desroches.
>
> Since v1:
> - add new patch03 to factorise sdhci_msm_pdata outisde of sdhci_msm_host.
> This is to fix drivers/mmc/host/sdhci-msm.c:440:32: warning: 'msm_host'
> is used uninitialized in this function [-Wuninitialized]
> - Add Arnd's Ack for all patches except patch3 which is new in v2
>
>
> Jisheng Zhang (13):
> mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation
> mmc: sdhci-esdhc-imx: use sdhci_pltfm_init for private allocation
> mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host
> mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
> mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove()
> mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation
> mmc: sdhci-of-at91: use sdhci_pltfm_init for private allocation
> mmc: sdhci-of-esdhc: use sdhci_pltfm_init for private allocation
> mmc: sdhci-pxav3: use sdhci_pltfm_init for private allocation
> mmc: sdhci-st: use sdhci_pltfm_init for private allocation
> mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation
> mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv
> mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host
>
> drivers/mmc/host/sdhci-bcm2835.c | 14 +++----------
> drivers/mmc/host/sdhci-esdhc-imx.c | 38 ++++++++++++++++--------------------
> drivers/mmc/host/sdhci-msm.c | 25 +++++++++++-------------
> drivers/mmc/host/sdhci-of-arasan.c | 33 +++++++++++++++----------------
> drivers/mmc/host/sdhci-of-at91.c | 33 ++++++++++++++-----------------
> drivers/mmc/host/sdhci-of-esdhc.c | 19 +++++++++---------
> drivers/mmc/host/sdhci-pltfm.h | 1 -
> drivers/mmc/host/sdhci-pxav2.c | 1 -
> drivers/mmc/host/sdhci-pxav3.c | 20 ++++++++-----------
> drivers/mmc/host/sdhci-st.c | 40 +++++++++++++++++++-------------------
> drivers/mmc/host/sdhci-tegra.c | 21 +++++++-------------
> 11 files changed, 106 insertions(+), 139 deletions(-)
>
> --
> 2.7.0
>
To avoid confusions. I don't intend to pick up any further sdhci
patches, unless they are acked by Adrian Hunter.
Kind regards
Uffe
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up
2016-02-04 10:38 ` [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up Ulf Hansson
@ 2016-02-08 14:09 ` Adrian Hunter
2016-02-16 2:38 ` Jisheng Zhang
0 siblings, 1 reply; 19+ messages in thread
From: Adrian Hunter @ 2016-02-08 14:09 UTC (permalink / raw)
To: linux-arm-kernel
On 04/02/16 12:38, Ulf Hansson wrote:
> + Adrian
>
> On 26 January 2016 at 11:15, Jisheng Zhang <jszhang@marvell.com> wrote:
>> These patches are to complete the TODOs in Commit 0e748234293f ("mmc:
>> sdhci: Add size for caller in init+register"), I.E:
>>
>> - todo: migrate clients to using allocation this way
>> - todo: remove priv variable once migration is complete
>>
>> Since v3:
>> - based on v4.5-rc1
>> - add Ludovic's ack for sdhci-of-at91 changes
>> - fix use-after-free in some drivers: some host drivers still needs to
>> access sdhci_pltfm_host->private after sdhci_pltfm_unregister(), but
>> the private should be already freed by sdhci_pltfm_unregister.
>> - add patch5 to fix one clk bug in sdhci_arasan_remove(). IMHO, It's
>> better to add this patch to fixes rather than waiting for next merge
>> window
>>
>> Since v2:
>> - based on mmc next tree and remove all priv usage introduced in newly
>> commits in this tree
>> - don't break two lines if sdhci_pltfm_init() call could be put into
>> one line. Thank Ludovic Desroches.
>>
>> Since v1:
>> - add new patch03 to factorise sdhci_msm_pdata outisde of sdhci_msm_host.
>> This is to fix drivers/mmc/host/sdhci-msm.c:440:32: warning: 'msm_host'
>> is used uninitialized in this function [-Wuninitialized]
>> - Add Arnd's Ack for all patches except patch3 which is new in v2
>>
>>
>> Jisheng Zhang (13):
>> mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-esdhc-imx: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host
>> mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove()
>> mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-of-at91: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-of-esdhc: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-pxav3: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-st: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation
>> mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv
>> mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host
>>
>> drivers/mmc/host/sdhci-bcm2835.c | 14 +++----------
>> drivers/mmc/host/sdhci-esdhc-imx.c | 38 ++++++++++++++++--------------------
>> drivers/mmc/host/sdhci-msm.c | 25 +++++++++++-------------
>> drivers/mmc/host/sdhci-of-arasan.c | 33 +++++++++++++++----------------
>> drivers/mmc/host/sdhci-of-at91.c | 33 ++++++++++++++-----------------
>> drivers/mmc/host/sdhci-of-esdhc.c | 19 +++++++++---------
>> drivers/mmc/host/sdhci-pltfm.h | 1 -
>> drivers/mmc/host/sdhci-pxav2.c | 1 -
>> drivers/mmc/host/sdhci-pxav3.c | 20 ++++++++-----------
>> drivers/mmc/host/sdhci-st.c | 40 +++++++++++++++++++-------------------
>> drivers/mmc/host/sdhci-tegra.c | 21 +++++++-------------
>> 11 files changed, 106 insertions(+), 139 deletions(-)
>>
>> --
>> 2.7.0
>>
>
> To avoid confusions. I don't intend to pick up any further sdhci
> patches, unless they are acked by Adrian Hunter.
The patches look OK, although patch 6 doesn't apply cleanly anymore.
Nevertheless:
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
^ permalink raw reply [flat|nested] 19+ messages in thread* [PATCH v4 00/13] mmc: use sdhci_pltfm_init for private allocation and clean up
2016-02-08 14:09 ` Adrian Hunter
@ 2016-02-16 2:38 ` Jisheng Zhang
0 siblings, 0 replies; 19+ messages in thread
From: Jisheng Zhang @ 2016-02-16 2:38 UTC (permalink / raw)
To: linux-arm-kernel
Dear Adrian, Ulf,
On Mon, 8 Feb 2016 16:09:37 +0200 Adrian Hunter wrote:
> On 04/02/16 12:38, Ulf Hansson wrote:
> > + Adrian
> >
> > On 26 January 2016 at 11:15, Jisheng Zhang <jszhang@marvell.com> wrote:
> >> These patches are to complete the TODOs in Commit 0e748234293f ("mmc:
> >> sdhci: Add size for caller in init+register"), I.E:
> >>
> >> - todo: migrate clients to using allocation this way
> >> - todo: remove priv variable once migration is complete
> >>
> >> Since v3:
> >> - based on v4.5-rc1
> >> - add Ludovic's ack for sdhci-of-at91 changes
> >> - fix use-after-free in some drivers: some host drivers still needs to
> >> access sdhci_pltfm_host->private after sdhci_pltfm_unregister(), but
> >> the private should be already freed by sdhci_pltfm_unregister.
> >> - add patch5 to fix one clk bug in sdhci_arasan_remove(). IMHO, It's
> >> better to add this patch to fixes rather than waiting for next merge
> >> window
> >>
> >> Since v2:
> >> - based on mmc next tree and remove all priv usage introduced in newly
> >> commits in this tree
> >> - don't break two lines if sdhci_pltfm_init() call could be put into
> >> one line. Thank Ludovic Desroches.
> >>
> >> Since v1:
> >> - add new patch03 to factorise sdhci_msm_pdata outisde of sdhci_msm_host.
> >> This is to fix drivers/mmc/host/sdhci-msm.c:440:32: warning: 'msm_host'
> >> is used uninitialized in this function [-Wuninitialized]
> >> - Add Arnd's Ack for all patches except patch3 which is new in v2
> >>
> >>
> >> Jisheng Zhang (13):
> >> mmc: sdhci-bcm2835: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-esdhc-imx: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-msm: factorise sdhci_msm_pdata outisde of sdhci_msm_host
> >> mmc: sdhci-msm: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-of-arasan: fix clk issue in sdhci_arasan_remove()
> >> mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-of-at91: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-of-esdhc: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-pxav3: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-st: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-tegra: use sdhci_pltfm_init for private allocation
> >> mmc: sdhci-pxav2: remove unnecessary assignment of pltfm_host->priv
> >> mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host
> >>
> >> drivers/mmc/host/sdhci-bcm2835.c | 14 +++----------
> >> drivers/mmc/host/sdhci-esdhc-imx.c | 38 ++++++++++++++++--------------------
> >> drivers/mmc/host/sdhci-msm.c | 25 +++++++++++-------------
> >> drivers/mmc/host/sdhci-of-arasan.c | 33 +++++++++++++++----------------
> >> drivers/mmc/host/sdhci-of-at91.c | 33 ++++++++++++++-----------------
> >> drivers/mmc/host/sdhci-of-esdhc.c | 19 +++++++++---------
> >> drivers/mmc/host/sdhci-pltfm.h | 1 -
> >> drivers/mmc/host/sdhci-pxav2.c | 1 -
> >> drivers/mmc/host/sdhci-pxav3.c | 20 ++++++++-----------
> >> drivers/mmc/host/sdhci-st.c | 40 +++++++++++++++++++-------------------
> >> drivers/mmc/host/sdhci-tegra.c | 21 +++++++-------------
> >> 11 files changed, 106 insertions(+), 139 deletions(-)
> >>
> >> --
> >> 2.7.0
> >>
> >
> > To avoid confusions. I don't intend to pick up any further sdhci
> > patches, unless they are acked by Adrian Hunter.
>
> The patches look OK, although patch 6 doesn't apply cleanly anymore.
> Nevertheless:
Sorry for being late. I'm just back from vacation.
Thank you very much for reviewing! I'll send a new series based on Ulf's next
branch.
>
> Acked-by: Adrian Hunter <adrian.hunter@intel.com>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 19+ messages in thread