From patchwork Fri Sep 29 10:51:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9977493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D2C3C60329 for ; Fri, 29 Sep 2017 10:51:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6B4A29783 for ; Fri, 29 Sep 2017 10:51:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBD0D29810; Fri, 29 Sep 2017 10:51:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 821C429783 for ; Fri, 29 Sep 2017 10:51:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbdI2Kvc (ORCPT ); Fri, 29 Sep 2017 06:51:32 -0400 Received: from pandora.armlinux.org.uk ([78.32.30.218]:43904 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751224AbdI2Kvb (ORCPT ); Fri, 29 Sep 2017 06:51:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=8F0Mmn1lSX0I8EZq2ctNI28WpguhEJknwHdgD6xZRBQ=; b=jH+1f72cWAKFSL7JrzfGXZ4rQ1h1xoxF0o7xvty36B84++6W4VeuNIuPgGX2fQKfACFGkyRjx9t68f9tgZ3Ubk7S/iPssLFXYF+3GmVxMN2SYuqCOSryL8dOXq33MaDQnXs5A773W74KTap50k8Y7bG1vhb3URpxJ9sOJ9kuPhs=; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:36572 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1dxstF-0000YX-Rc; Fri, 29 Sep 2017 11:51:29 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1dxst8-0006jN-Vn; Fri, 29 Sep 2017 11:51:23 +0100 In-Reply-To: <20170929105004.GY20805@n2100.armlinux.org.uk> References: <20170929105004.GY20805@n2100.armlinux.org.uk> From: Russell King To: Bartlomiej Zolnierkiewicz Cc: linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org Subject: [PATCH 6/8] video: sa1100fb: clean up failure path MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 29 Sep 2017 11:51:22 +0100 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We merely return from the failed path, so remove all the gotos and use return statements instead. Signed-off-by: Russell King --- drivers/video/fbdev/sa1100fb.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c index 7fa6c8f74ec6..16a974471c02 100644 --- a/drivers/video/fbdev/sa1100fb.c +++ b/drivers/video/fbdev/sa1100fb.c @@ -1222,41 +1222,36 @@ static int sa1100fb_probe(struct platform_device *pdev) return -EINVAL; fbi = sa1100fb_init_fbinfo(&pdev->dev); - ret = -ENOMEM; if (!fbi) - goto failed; + return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); fbi->base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(fbi->base)) { - ret = PTR_ERR(fbi->base); - goto failed; - } + if (IS_ERR(fbi->base)) + return PTR_ERR(fbi->base); fbi->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(fbi->clk)) { - ret = PTR_ERR(fbi->clk); - goto failed; - } + if (IS_ERR(fbi->clk)) + return PTR_ERR(fbi->clk); ret = devm_request_irq(&pdev->dev, irq, sa1100fb_handle_irq, 0, "LCD", fbi); if (ret) { dev_err(&pdev->dev, "request_irq failed: %d\n", ret); - goto failed; + return ret; } if (machine_is_shannon()) { ret = devm_gpio_request_one(&pdev->dev, SHANNON_GPIO_DISP_EN, GPIOF_OUT_INIT_LOW, "display enable"); if (ret) - goto failed; + return ret; } /* Initialize video memory */ ret = sa1100fb_map_video_memory(fbi); if (ret) - goto failed; + return ret; /* * This makes sure that our colour bitfield