From patchwork Tue Jun 14 15:07:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 635360 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rTY1L64YQz9t1M for ; Wed, 15 Jun 2016 01:08:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=fSATw/eN; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751388AbcFNPIE (ORCPT ); Tue, 14 Jun 2016 11:08:04 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:35967 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968AbcFNPID (ORCPT ); Tue, 14 Jun 2016 11:08:03 -0400 Received: by mail-lf0-f50.google.com with SMTP id q132so68633469lfe.3 for ; Tue, 14 Jun 2016 08:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TqeR5sZLAHbDJRwBqfHigXp7pL9CuladLjbMwjT/Ra0=; b=fSATw/eNZGvGMdeQfyBLErsvTDxtepn/N4JlGm8mN04LOuCTljil2S2f2j8ae5HmPX XqZcnbQMpYhxEemfxsE/zO0sB/nw1N0l4niMzBlUziwnhPjF3LZ1HNqsfBm8t9qAHXFq /jBUFaE9NHSSsOVVwf8ZAeJ7HQiJw6HHonKLk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TqeR5sZLAHbDJRwBqfHigXp7pL9CuladLjbMwjT/Ra0=; b=GfoYlX3sqgEPsOtrBGDHWMog/lsPthP1lLfGBX+NDfanjFTaJ18mSkkw7ZXKKCSQ/u yeGGALrT+iiI3qqDzZAmByR6B6Al6RmfSCJTm6q2VmtGdt3353PAXl7pWW4QXWC2Jnj5 4Jff6U/He3XCx5HFv/B6yg6m4/HanYov9rg1M8WEHHgWJgW2rwDtwL9SVEi6sDyaUG6r hcGuUbA9KAt4boer9sWAi068s1/PveDvtgloy0D6UL5bNAQjQS74J1NnnPpXSn80NVgX u5dbjUHCBJKO62kbCRjpSQ6bLOzMUt1DwtjX+WgsuyKn29CX49rf8XscN+Bgnaz4txag 0umQ== X-Gm-Message-State: ALyK8tLK57gDv0hHJQurnbc42JQz4ZVhfmGbLRUCAVMBoOXP7d0n+7hX/UlqsDC5J1jznr5v X-Received: by 10.25.213.200 with SMTP id m191mr1772757lfg.52.1465916877202; Tue, 14 Jun 2016 08:07:57 -0700 (PDT) Received: from localhost.localdomain (h-155-4-128-67.na.cust.bahnhof.se. [155.4.128.67]) by smtp.gmail.com with ESMTPSA id f195sm3477060lfb.47.2016.06.14.08.07.55 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2016 08:07:55 -0700 (PDT) From: Ulf Hansson To: Wolfram Sang , linux-i2c@vger.kernel.org Cc: Jarkko Nikula , Andy Shevchenko , Mika Westerberg , John Stultz , Guodong Xu , linux-arm-kernel@lists.infradead.org, Ulf Hansson Subject: [PATCH 08/10] i2c: designware-platdrv: Check return value from clk_prepare_enable() Date: Tue, 14 Jun 2016 17:07:26 +0200 Message-Id: <1465916848-8207-9-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465916848-8207-1-git-send-email-ulf.hansson@linaro.org> References: <1465916848-8207-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org As clk_prepare_enable() can fail, let's not ignore the error in the ->runtime_resume() callback, but instead propagate it. This change decreases the callers of i2c_dw_plat_prepare_clk() down to one, which seems like a justification of removing it. Instead let's call clk_disable_unprepare() directly when needed. Signed-off-by: Ulf Hansson --- drivers/i2c/busses/i2c-designware-platdrv.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 95a9f4e..2b91af3 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -308,25 +308,15 @@ static void dw_i2c_plat_complete(struct device *dev) #endif #ifdef CONFIG_PM -static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare) -{ - if (IS_ERR(i_dev->clk)) - return PTR_ERR(i_dev->clk); - - if (prepare) - return clk_prepare_enable(i_dev->clk); - - clk_disable_unprepare(i_dev->clk); - return 0; -} - static int dw_i2c_plat_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); i2c_dw_disable(i_dev); - i2c_dw_plat_prepare_clk(i_dev, false); + + if (!IS_ERR(i_dev->clk)) + clk_disable_unprepare(i_dev->clk); return 0; } @@ -335,10 +325,15 @@ static int dw_i2c_plat_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev); + int ret; - i2c_dw_plat_prepare_clk(i_dev, true); - i2c_dw_init(i_dev); + if (!IS_ERR(i_dev->clk)) { + ret = clk_prepare_enable(i_dev->clk); + if (ret) + return ret; + } + i2c_dw_init(i_dev); return 0; }