| Message ID | 20170130114116.22089-6-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30 January 2017 at 12:41, Philipp Zabel <p.zabel@pengutronix.de> wrote: > As of commit bb475230b8e5 ("reset: make optional functions really > optional"), the reset framework API calls use NULL pointers to describe > optional, non-present reset controls. > > This allows to return errors from devm_reset_control_get_optional and to > call reset_control_(de)assert unconditionally. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Guodong Xu <guodong.xu@linaro.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> Philipp, I have looked at patch 6,7,8 in this series - they look good to me. However, could you please re-post to linux-mmc and make sure to include the proper driver maintainers for each change. For example, Jaehoon Chung maintains dw_mmc. Moreover, I assume you want me to pick the mmc changes or is there is dependency to another tree here? Kind regards Uffe > --- > drivers/mmc/host/dw_mmc.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index b44306b886cb6..9039e8f81ff12 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -2963,10 +2963,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > > /* find reset controller when exist */ > pdata->rstc = devm_reset_control_get_optional(dev, "reset"); > - if (IS_ERR(pdata->rstc)) { > - if (PTR_ERR(pdata->rstc) == -EPROBE_DEFER) > - return ERR_PTR(-EPROBE_DEFER); > - } > + if (IS_ERR(pdata->rstc)) > + return ERR_CAST(pdata->rstc); > > /* find out number of slots supported */ > of_property_read_u32(np, "num-slots", &pdata->num_slots); > @@ -3090,7 +3088,7 @@ int dw_mci_probe(struct dw_mci *host) > } > } > > - if (!IS_ERR(host->pdata->rstc)) { > + if (host->pdata->rstc) { > reset_control_assert(host->pdata->rstc); > usleep_range(10, 50); > reset_control_deassert(host->pdata->rstc); > @@ -3245,8 +3243,7 @@ int dw_mci_probe(struct dw_mci *host) > if (host->use_dma && host->dma_ops->exit) > host->dma_ops->exit(host); > > - if (!IS_ERR(host->pdata->rstc)) > - reset_control_assert(host->pdata->rstc); > + reset_control_assert(host->pdata->rstc); > > err_clk_ciu: > clk_disable_unprepare(host->ciu_clk); > @@ -3278,8 +3275,7 @@ void dw_mci_remove(struct dw_mci *host) > if (host->use_dma && host->dma_ops->exit) > host->dma_ops->exit(host); > > - if (!IS_ERR(host->pdata->rstc)) > - reset_control_assert(host->pdata->rstc); > + reset_control_assert(host->pdata->rstc); > > clk_disable_unprepare(host->ciu_clk); > clk_disable_unprepare(host->biu_clk); > -- > 2.11.0 >
On Tue, 2017-01-31 at 12:52 +0100, Ulf Hansson wrote: > On 30 January 2017 at 12:41, Philipp Zabel <p.zabel@pengutronix.de> wrote: > > As of commit bb475230b8e5 ("reset: make optional functions really > > optional"), the reset framework API calls use NULL pointers to describe > > optional, non-present reset controls. > > > > This allows to return errors from devm_reset_control_get_optional and to > > call reset_control_(de)assert unconditionally. > > > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > Cc: Guodong Xu <guodong.xu@linaro.org> > > Cc: Ulf Hansson <ulf.hansson@linaro.org> > > Philipp, I have looked at patch 6,7,8 in this series - they look good to me. Thank you. > However, could you please re-post to linux-mmc and make sure to > include the proper driver maintainers for each change. For example, > Jaehoon Chung maintains dw_mmc. My mistake, I tried to be clever and include the people responsible for the reset code, manually, and managed to forget a few maintainers instead. > Moreover, I assume you want me to pick the mmc changes or is there is > dependency to another tree here? arm-soc, currently. I think the easiest will be if I just resend this after bb475230b8e5 is merged into mainline. regards Philipp
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index b44306b886cb6..9039e8f81ff12 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2963,10 +2963,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) /* find reset controller when exist */ pdata->rstc = devm_reset_control_get_optional(dev, "reset"); - if (IS_ERR(pdata->rstc)) { - if (PTR_ERR(pdata->rstc) == -EPROBE_DEFER) - return ERR_PTR(-EPROBE_DEFER); - } + if (IS_ERR(pdata->rstc)) + return ERR_CAST(pdata->rstc); /* find out number of slots supported */ of_property_read_u32(np, "num-slots", &pdata->num_slots); @@ -3090,7 +3088,7 @@ int dw_mci_probe(struct dw_mci *host) } } - if (!IS_ERR(host->pdata->rstc)) { + if (host->pdata->rstc) { reset_control_assert(host->pdata->rstc); usleep_range(10, 50); reset_control_deassert(host->pdata->rstc); @@ -3245,8 +3243,7 @@ int dw_mci_probe(struct dw_mci *host) if (host->use_dma && host->dma_ops->exit) host->dma_ops->exit(host); - if (!IS_ERR(host->pdata->rstc)) - reset_control_assert(host->pdata->rstc); + reset_control_assert(host->pdata->rstc); err_clk_ciu: clk_disable_unprepare(host->ciu_clk); @@ -3278,8 +3275,7 @@ void dw_mci_remove(struct dw_mci *host) if (host->use_dma && host->dma_ops->exit) host->dma_ops->exit(host); - if (!IS_ERR(host->pdata->rstc)) - reset_control_assert(host->pdata->rstc); + reset_control_assert(host->pdata->rstc); clk_disable_unprepare(host->ciu_clk); clk_disable_unprepare(host->biu_clk);
As of commit bb475230b8e5 ("reset: make optional functions really optional"), the reset framework API calls use NULL pointers to describe optional, non-present reset controls. This allows to return errors from devm_reset_control_get_optional and to call reset_control_(de)assert unconditionally. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Cc: Guodong Xu <guodong.xu@linaro.org> Cc: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/mmc/host/dw_mmc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)