From patchwork Fri Sep 29 10:51:01 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: 9977485 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 C4EED60329 for ; Fri, 29 Sep 2017 10:51:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9A2A29783 for ; Fri, 29 Sep 2017 10:51:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE64529810; Fri, 29 Sep 2017 10:51:14 +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 7212E29783 for ; Fri, 29 Sep 2017 10:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751831AbdI2KvO (ORCPT ); Fri, 29 Sep 2017 06:51:14 -0400 Received: from pandora.armlinux.org.uk ([78.32.30.218]:43878 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbdI2KvN (ORCPT ); Fri, 29 Sep 2017 06:51:13 -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=PzT/nXhuvhBDWR0P/wHR44mwV4J9/qTlblPWEbit4KA=; b=OcL4aCkaSSVBjPr0kT9xiFzeB57jdvGkeGxtE/nQx4Jrd0oVVeonDg6WO+24MT4iSPVZCLGsF+zb+Lkne+AuGqYk4mEcWHLVf1ZjZX0DSz4MTFqZIQr9a3DDIjB77vQEov1Nyl4yABPSyuvMIMX6UQiHf+vT7mcu8bnusAhG0g4=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:47024 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 1dxssw-0000Xv-Fa; Fri, 29 Sep 2017 11:51:10 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1dxssn-0006iu-Um; Fri, 29 Sep 2017 11:51:02 +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 2/8] video: sa1100fb: use devm_clk_get() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 29 Sep 2017 11:51:01 +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 Use devm_clk_get() to get the clock for the LCD. Signed-off-by: Russell King --- drivers/video/fbdev/sa1100fb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c index 05a80e08dcde..1562d7607dd2 100644 --- a/drivers/video/fbdev/sa1100fb.c +++ b/drivers/video/fbdev/sa1100fb.c @@ -1230,10 +1230,9 @@ static int sa1100fb_probe(struct platform_device *pdev) if (!fbi) goto failed; - fbi->clk = clk_get(&pdev->dev, NULL); + fbi->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(fbi->clk)) { ret = PTR_ERR(fbi->clk); - fbi->clk = NULL; goto failed; } @@ -1289,8 +1288,6 @@ static int sa1100fb_probe(struct platform_device *pdev) failed: if (fbi) iounmap(fbi->base); - if (fbi->clk) - clk_put(fbi->clk); release_mem_region(res->start, resource_size(res)); return ret; }