From: Philipp Zabel <p.zabel@pengutronix.de> To: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 3/3] video: fbdev: imxfb: add some error handling Date: Tue, 08 Mar 2016 08:00:05 +0000 [thread overview] Message-ID: <1457424005.4174.6.camel@pengutronix.de> (raw) In-Reply-To: <1457380425-20244-4-git-send-email-u.kleine-koenig@pengutronix.de> Am Montag, den 07.03.2016, 20:53 +0100 schrieb Uwe Kleine-König: > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/video/fbdev/imxfb.c | 33 ++++++++++++++++++++++++++------- > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c > index 3dd2824e6773..671b3719db56 100644 > --- a/drivers/video/fbdev/imxfb.c > +++ b/drivers/video/fbdev/imxfb.c > @@ -473,8 +473,9 @@ static int imxfb_set_par(struct fb_info *info) > return 0; > } > > -static void imxfb_enable_controller(struct imxfb_info *fbi) > +static int imxfb_enable_controller(struct imxfb_info *fbi) > { > + int ret; > > if (fbi->enabled) > return; > @@ -496,10 +497,27 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) > */ > writel(RMCR_LCDC_EN_MX1, fbi->regs + LCDC_RMCR); > > - clk_prepare_enable(fbi->clk_ipg); > - clk_prepare_enable(fbi->clk_ahb); > - clk_prepare_enable(fbi->clk_per); > + ret = clk_prepare_enable(fbi->clk_ipg); > + if (ret) > + goto err_enable_ipg; > + > + ret = clk_prepare_enable(fbi->clk_ahb); > + if (ret) > + goto err_enable_ahb; > + > + ret = clk_prepare_enable(fbi->clk_per); > + if (ret) { > + clk_disable_unprepare(fbi->clk_ahb); > +err_enable_ahb: > + clk_disable_unprepare(fbi->clk_ipg); > +err_enable_ipg: > + writel(0, fbi->regs + LCDC_RMCR); > + > + return ret; > + } > + > fbi->enabled = true; > + return 0; > } > > static void imxfb_disable_controller(struct imxfb_info *fbi) > @@ -510,8 +528,8 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) > pr_debug("Disabling LCD controller\n"); > > clk_disable_unprepare(fbi->clk_per); > - clk_disable_unprepare(fbi->clk_ipg); > clk_disable_unprepare(fbi->clk_ahb); > + clk_disable_unprepare(fbi->clk_ipg); > fbi->enabled = false; > > writel(0, fbi->regs + LCDC_RMCR); > @@ -520,6 +538,7 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) > static int imxfb_blank(int blank, struct fb_info *info) > { > struct imxfb_info *fbi = info->par; > + int ret = 0;; s/;;/;/ > > pr_debug("imxfb_blank: blank=%d\n", blank); > > @@ -532,10 +551,10 @@ static int imxfb_blank(int blank, struct fb_info *info) > break; > > case FB_BLANK_UNBLANK: > - imxfb_enable_controller(fbi); > + ret = imxfb_enable_controller(fbi); > break; or this could be simplified to: return imxfb_enable_controller(fbi); > } > - return 0; > + return ret; > } > > static struct fb_ops imxfb_ops = { Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
WARNING: multiple messages have this Message-ID (diff)
From: p.zabel@pengutronix.de (Philipp Zabel) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] video: fbdev: imxfb: add some error handling Date: Tue, 08 Mar 2016 09:00:05 +0100 [thread overview] Message-ID: <1457424005.4174.6.camel@pengutronix.de> (raw) In-Reply-To: <1457380425-20244-4-git-send-email-u.kleine-koenig@pengutronix.de> Am Montag, den 07.03.2016, 20:53 +0100 schrieb Uwe Kleine-K?nig: > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > --- > drivers/video/fbdev/imxfb.c | 33 ++++++++++++++++++++++++++------- > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c > index 3dd2824e6773..671b3719db56 100644 > --- a/drivers/video/fbdev/imxfb.c > +++ b/drivers/video/fbdev/imxfb.c > @@ -473,8 +473,9 @@ static int imxfb_set_par(struct fb_info *info) > return 0; > } > > -static void imxfb_enable_controller(struct imxfb_info *fbi) > +static int imxfb_enable_controller(struct imxfb_info *fbi) > { > + int ret; > > if (fbi->enabled) > return; > @@ -496,10 +497,27 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) > */ > writel(RMCR_LCDC_EN_MX1, fbi->regs + LCDC_RMCR); > > - clk_prepare_enable(fbi->clk_ipg); > - clk_prepare_enable(fbi->clk_ahb); > - clk_prepare_enable(fbi->clk_per); > + ret = clk_prepare_enable(fbi->clk_ipg); > + if (ret) > + goto err_enable_ipg; > + > + ret = clk_prepare_enable(fbi->clk_ahb); > + if (ret) > + goto err_enable_ahb; > + > + ret = clk_prepare_enable(fbi->clk_per); > + if (ret) { > + clk_disable_unprepare(fbi->clk_ahb); > +err_enable_ahb: > + clk_disable_unprepare(fbi->clk_ipg); > +err_enable_ipg: > + writel(0, fbi->regs + LCDC_RMCR); > + > + return ret; > + } > + > fbi->enabled = true; > + return 0; > } > > static void imxfb_disable_controller(struct imxfb_info *fbi) > @@ -510,8 +528,8 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) > pr_debug("Disabling LCD controller\n"); > > clk_disable_unprepare(fbi->clk_per); > - clk_disable_unprepare(fbi->clk_ipg); > clk_disable_unprepare(fbi->clk_ahb); > + clk_disable_unprepare(fbi->clk_ipg); > fbi->enabled = false; > > writel(0, fbi->regs + LCDC_RMCR); > @@ -520,6 +538,7 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) > static int imxfb_blank(int blank, struct fb_info *info) > { > struct imxfb_info *fbi = info->par; > + int ret = 0;; s/;;/;/ > > pr_debug("imxfb_blank: blank=%d\n", blank); > > @@ -532,10 +551,10 @@ static int imxfb_blank(int blank, struct fb_info *info) > break; > > case FB_BLANK_UNBLANK: > - imxfb_enable_controller(fbi); > + ret = imxfb_enable_controller(fbi); > break; or this could be simplified to: return imxfb_enable_controller(fbi); > } > - return 0; > + return ret; > } > > static struct fb_ops imxfb_ops = { Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
next prev parent reply other threads:[~2016-03-08 8:00 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-07 19:53 [PATCH 0/3] video: fbdev: imxfb: make it work again Uwe Kleine-König 2016-03-07 19:53 ` Uwe Kleine-König 2016-03-07 19:53 ` [PATCH 1/3] video: fbdev: imxfb: fix semantic of .get_power and .set_power Uwe Kleine-König 2016-03-07 19:53 ` Uwe Kleine-König 2016-03-08 7:55 ` Philipp Zabel 2016-03-08 7:55 ` Philipp Zabel 2016-03-08 8:30 ` Uwe Kleine-König 2016-03-08 8:30 ` Uwe Kleine-König 2016-03-07 19:53 ` [PATCH 2/3] video: fbdev: imxfb: enable lcd regulator in .probe Uwe Kleine-König 2016-03-07 19:53 ` Uwe Kleine-König 2016-03-11 11:22 ` Tomi Valkeinen 2016-03-11 11:22 ` Tomi Valkeinen 2016-04-20 19:17 ` Uwe Kleine-König 2016-04-20 19:17 ` Uwe Kleine-König 2016-07-05 10:09 ` Uwe Kleine-König 2016-07-05 10:09 ` Uwe Kleine-König 2016-07-05 12:08 ` Lothar Waßmann 2016-07-05 12:08 ` Lothar Waßmann 2016-07-05 12:22 ` Uwe Kleine-König 2016-07-05 12:22 ` Uwe Kleine-König 2016-07-27 19:57 ` Uwe Kleine-König 2016-07-27 19:57 ` Uwe Kleine-König 2016-08-10 10:29 ` Tomi Valkeinen 2016-08-10 10:29 ` Tomi Valkeinen 2016-03-07 19:53 ` [PATCH 3/3] video: fbdev: imxfb: add some error handling Uwe Kleine-König 2016-03-07 19:53 ` Uwe Kleine-König 2016-03-08 8:00 ` Philipp Zabel [this message] 2016-03-08 8:00 ` Philipp Zabel 2016-03-11 11:26 ` Tomi Valkeinen 2016-03-11 11:26 ` Tomi Valkeinen 2016-03-07 20:03 ` [PATCH 0/3] video: fbdev: imxfb: make it work again Fabio Estevam 2016-03-07 20:03 ` Fabio Estevam 2016-03-07 20:10 ` Uwe Kleine-König 2016-03-07 20:10 ` Uwe Kleine-König
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1457424005.4174.6.camel@pengutronix.de \ --to=p.zabel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.