From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH v6 2/2] mtd: nand: sunxi: add reset line support Date: Fri, 24 Jun 2016 06:16:45 +0200 Message-ID: <20160624061645.20af1888@bbrezillon> References: <20160620044838.56904-1-icenowy@aosc.xyz> <20160620044838.56904-2-icenowy@aosc.xyz> <20160623180108.382bbaae@bbrezillon> <1284641466724038@web7h.yandex.ru> Reply-To: boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org In-Reply-To: <1284641466724038-tvSLaYVQeptuio3avFS2gg@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Icenowy Zheng Cc: "maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org" , "wens-jdAy2FN1RRM@public.gmane.org" , "robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" , "richard-/L3Ra7n9ekc@public.gmane.org" , "dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org" , "computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" , "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" List-Id: devicetree@vger.kernel.org On Fri, 24 Jun 2016 07:20:38 +0800 Icenowy Zheng wrote: > In my opinion, return directly PTR_ERR(nfc->reset) is OK here. > If devm_reset_control_get_optional() return -EPROBE_DEFER, the code here = will also return it. However, if we get other error, why should it return -= EPROBE_DEFER again? Sorry, I just had a brainfart :-). Your implementation is correct. BTW, can you avoid top-posting and reply inline? >=20 > 24.06.2016, 00:01, "Boris Brezillon" = : > > On Mon, 20 Jun 2016 12:48:38 +0800 > > Icenowy Zheng wrote: > > =20 > >> =C2=A0The NAND controller on some sun8i chips needs its reset line to = be > >> =C2=A0deasserted before they can enter working state. > >> > >> =C2=A0Signed-off-by: Icenowy Zheng > >> =C2=A0--- > >> =C2=A0=C2=A0=C2=A0Changes in v2: > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- Corrected the error checking code of r= eset line. > >> > >> =C2=A0=C2=A0=C2=A0Changes in v3: > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- Corrected a more serious error brought= in the "fix" of v2. > >> > >> =C2=A0=C2=A0=C2=A0Changes in v4: > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- Removed unneeded code block after "els= e". > >> > >> =C2=A0=C2=A0=C2=A0Changes in v5: > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- Added reassertion code in case of init= ialization error and device > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0remove. > >> > >> =C2=A0=C2=A0=C2=A0Changes in v6: > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- Fixed a resource leak by not using got= o to exit in case of error. > >> > >> =C2=A0=C2=A0drivers/mtd/nand/sunxi_nand.c | 28 +++++++++++++++++++++++= ++--- > >> =C2=A0=C2=A01 file changed, 25 insertions(+), 3 deletions(-) > >> > >> =C2=A0diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/su= nxi_nand.c > >> =C2=A0index a83a690..08d5e88 100644 > >> =C2=A0--- a/drivers/mtd/nand/sunxi_nand.c > >> =C2=A0+++ b/drivers/mtd/nand/sunxi_nand.c > >> =C2=A0@@ -39,6 +39,7 @@ > >> =C2=A0=C2=A0#include > >> =C2=A0=C2=A0#include > >> =C2=A0=C2=A0#include > >> =C2=A0+#include > >> > >> =C2=A0=C2=A0#define NFC_REG_CTL 0x0000 > >> =C2=A0=C2=A0#define NFC_REG_ST 0x0004 > >> =C2=A0@@ -269,6 +270,7 @@ struct sunxi_nfc { > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0void __iom= em *regs; > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0struct clk= *ahb_clk; > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0struct clk= *mod_clk; > >> =C2=A0+ struct reset_control *reset; > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0unsigned l= ong assigned_cs; > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0unsigned l= ong clk_rate; > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0struct lis= t_head chips; > >> =C2=A0@@ -1871,26 +1873,42 @@ static int sunxi_nfc_probe(struct platfo= rm_device *pdev) > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (ret) > >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0goto out_ahb_clk_unprepare; > >> > >> =C2=A0+ nfc->reset =3D devm_reset_control_get_optional(dev, "ahb"); > >> =C2=A0+ > >> =C2=A0+ if (!IS_ERR(nfc->reset)) { > >> =C2=A0+ ret =3D reset_control_deassert(nfc->reset); > >> =C2=A0+ if (ret) { > >> =C2=A0+ dev_err(dev, "reset err %d\n", ret); > >> =C2=A0+ goto out_mod_clk_unprepare; > >> =C2=A0+ } > >> =C2=A0+ } else if (PTR_ERR(nfc->reset) !=3D -ENOENT) { > >> =C2=A0+ ret =3D PTR_ERR(nfc->reset); =20 > > > > You should return -EDEFER_PROBE here. > > > > And can you please rebase this series on top of nand/next [1]? > > > > [1]https://github.com/linux-nand/linux/tree/nand/next =20 --=20 You received this message because you are subscribed to the Google Groups "= linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout.