| Message ID | 20170719152646.25903-43-p.zabel@pengutronix.de |
|---|---|
| State | Accepted |
| Delegated to: | Boris Brezillon |
| Headers | show |
Hi Philipp, On Wed, 19 Jul 2017 17:25:46 +0200 Philipp Zabel <p.zabel@pengutronix.de> wrote: > Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting > reset lines") started to transition the reset control request API calls > to explicitly state whether the driver needs exclusive or shared reset > control behavior. Convert all drivers requesting exclusive resets to the > explicit API call so the temporary transition helpers can be removed. > > No functional changes. If you don't mind, I'd like to take this patch in the nand tree, just in case we have other modifications on sunxi_nand.c for this cycle. Regards, Boris > > Cc: Boris Brezillon <boris.brezillon@free-electrons.com> > Cc: Richard Weinberger <richard@nod.at> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Brian Norris <computersforpeace@gmail.com> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> > Cc: Maxime Ripard <maxime.ripard@free-electrons.com> > Cc: Chen-Yu Tsai <wens@csie.org> > Cc: linux-mtd@lists.infradead.org > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > drivers/mtd/nand/sunxi_nand.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c > index d0b6f8f9f297a..6eb97451f485c 100644 > --- a/drivers/mtd/nand/sunxi_nand.c > +++ b/drivers/mtd/nand/sunxi_nand.c > @@ -2208,7 +2208,7 @@ static int sunxi_nfc_probe(struct platform_device *pdev) > if (ret) > goto out_ahb_clk_unprepare; > > - nfc->reset = devm_reset_control_get_optional(dev, "ahb"); > + nfc->reset = devm_reset_control_get_optional_exclusive(dev, "ahb"); > if (IS_ERR(nfc->reset)) { > ret = PTR_ERR(nfc->reset); > goto out_mod_clk_unprepare;
On Thu, 2017-07-20 at 09:00 +0200, Boris Brezillon wrote: > Hi Philipp, > > On Wed, 19 Jul 2017 17:25:46 +0200 > Philipp Zabel <p.zabel@pengutronix.de> wrote: > > > Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting > > reset lines") started to transition the reset control request API calls > > to explicitly state whether the driver needs exclusive or shared reset > > control behavior. Convert all drivers requesting exclusive resets to the > > explicit API call so the temporary transition helpers can be removed. > > > > No functional changes. > > If you don't mind, I'd like to take this patch in the nand tree, just in > case we have other modifications on sunxi_nand.c for this cycle. Absolutely, I'd like to only to apply the last two patches myself, eventually. regards Philipp
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index d0b6f8f9f297a..6eb97451f485c 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -2208,7 +2208,7 @@ static int sunxi_nfc_probe(struct platform_device *pdev) if (ret) goto out_ahb_clk_unprepare; - nfc->reset = devm_reset_control_get_optional(dev, "ahb"); + nfc->reset = devm_reset_control_get_optional_exclusive(dev, "ahb"); if (IS_ERR(nfc->reset)) { ret = PTR_ERR(nfc->reset); goto out_mod_clk_unprepare;
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting reset lines") started to transition the reset control request API calls to explicitly state whether the driver needs exclusive or shared reset control behavior. Convert all drivers requesting exclusive resets to the explicit API call so the temporary transition helpers can be removed. No functional changes. Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Richard Weinberger <richard@nod.at> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Brian Norris <computersforpeace@gmail.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: linux-mtd@lists.infradead.org Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/mtd/nand/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)