From patchwork Mon Jun 20 17:56:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 9188423 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 E328B607D1 for ; Mon, 20 Jun 2016 18:08:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D96AD27BFC for ; Mon, 20 Jun 2016 18:08:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE32127CCB; Mon, 20 Jun 2016 18:08:54 +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 4986327BFC for ; Mon, 20 Jun 2016 18:08:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756042AbcFTSIc (ORCPT ); Mon, 20 Jun 2016 14:08:32 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:35563 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbcFTSIP (ORCPT ); Mon, 20 Jun 2016 14:08:15 -0400 Received: by mail-pf0-f169.google.com with SMTP id c2so56436121pfa.2 for ; Mon, 20 Jun 2016 11:07:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+yqRA+26HqvULi4zy92VgoIE5p2ZHBSHbshQdiLYU6M=; b=kT44fHykJhyPVJjBeJPCmGEBece4ZOPD+mNDup/Pra5mQwDeJHwbiWJiUXA1YEeyXH 3cv2phTyHycB6TvHu7OSaqxhbiEbGeABJIBQM3X5aMrsmEBRDV5+ZRf0fqPSYKyRzYdt k+gKfEZDAHvSJFBDnvjGN/FWwks9kGRRwWgls= 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=+yqRA+26HqvULi4zy92VgoIE5p2ZHBSHbshQdiLYU6M=; b=F2CeD9OBh30zn8PvGNhLIoeODnBU4kHeA0NbENjLHauWZPd2g5mJ3Ijz0Ad+r99BUD iNFa8F/q3hx2tTfAwFfa1v9bmPdlVdELnb9okc5aV6OxWdLHx9VJHIX6SJpU7zlL7gtp L1qOnEI1Uj4Mg6wxec6iq7rPlRfoaFnHWPoA2DHAfCVC1UIeE/za3Kas7aI148wvnWA1 qXVLZ0fVeThUDw2J54fJDoNf0muHCeyrQi4Ql9Jnmj9WkdWdN9NySOE/asXgcVMYUhXr nP25L/eleyuSnAUVDIXumpeNvVlg526QZEsjewIyZVz+ePPGsatpGaQ7fUeLu7gkolwL eXFw== X-Gm-Message-State: ALyK8tKgFl/ty/3AzhIkVzTK/C0otyzh+iSxGkcxfnCxSX07W0gGdp+Cayva21/mN/F4PDfT X-Received: by 10.98.40.4 with SMTP id o4mr23135129pfo.165.1466445654193; Mon, 20 Jun 2016 11:00:54 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id c189sm60250353pfg.19.2016.06.20.11.00.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Jun 2016 11:00:53 -0700 (PDT) From: Douglas Anderson To: ulf.hansson@linaro.org, Heiko Stuebner Cc: kishon@ti.com, robh+dt@kernel.org, shawn.lin@rock-chips.com, xzy.xu@rock-chips.com, briannorris@chromium.org, adrian.hunter@intel.com, linux-rockchip@lists.infradead.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, groeck@chromium.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 13/15] phy: rockchip-emmc: Minor code cleanup in rockchip_emmc_phy_power_on/off() Date: Mon, 20 Jun 2016 10:56:52 -0700 Message-Id: <1466445414-11974-14-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1466445414-11974-1-git-send-email-dianders@chromium.org> References: <1466445414-11974-1-git-send-email-dianders@chromium.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There's no reason to store the return value of rockchip_emmc_phy_power() in a variable nor to check it. Just return it. Signed-off-by: Douglas Anderson Acked-by: Kishon Vijay Abraham I Reviewed-by: Shawn Lin Tested-by: Heiko Stuebner --- Changes in v3: - Add collected tags Changes in v2: - Move code cleanup before set phyctrl_frqsel based on card clock (Shawn) drivers/phy/phy-rockchip-emmc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/phy/phy-rockchip-emmc.c b/drivers/phy/phy-rockchip-emmc.c index 2d059c046978..23fe50864526 100644 --- a/drivers/phy/phy-rockchip-emmc.c +++ b/drivers/phy/phy-rockchip-emmc.c @@ -169,20 +169,14 @@ static int rockchip_emmc_phy_power(struct rockchip_emmc_phy *rk_phy, static int rockchip_emmc_phy_power_off(struct phy *phy) { struct rockchip_emmc_phy *rk_phy = phy_get_drvdata(phy); - int ret = 0; /* Power down emmc phy analog blocks */ - ret = rockchip_emmc_phy_power(rk_phy, PHYCTRL_PDB_PWR_OFF); - if (ret) - return ret; - - return 0; + return rockchip_emmc_phy_power(rk_phy, PHYCTRL_PDB_PWR_OFF); } static int rockchip_emmc_phy_power_on(struct phy *phy) { struct rockchip_emmc_phy *rk_phy = phy_get_drvdata(phy); - int ret = 0; /* DLL operation: 200 MHz */ regmap_write(rk_phy->reg_base, @@ -213,11 +207,7 @@ static int rockchip_emmc_phy_power_on(struct phy *phy) PHYCTRL_OTAPDLYSEL_SHIFT)); /* Power up emmc phy analog blocks */ - ret = rockchip_emmc_phy_power(rk_phy, PHYCTRL_PDB_PWR_ON); - if (ret) - return ret; - - return 0; + return rockchip_emmc_phy_power(rk_phy, PHYCTRL_PDB_PWR_ON); } static const struct phy_ops ops = {