From patchwork Mon Jun 13 23:04:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 9174681 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 F13CD60573 for ; Mon, 13 Jun 2016 23:09:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E17FD26861 for ; Mon, 13 Jun 2016 23:09:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D533F2723E; Mon, 13 Jun 2016 23:09:01 +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 809AA26861 for ; Mon, 13 Jun 2016 23:09:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423817AbcFMXFH (ORCPT ); Mon, 13 Jun 2016 19:05:07 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34285 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423784AbcFMXFF (ORCPT ); Mon, 13 Jun 2016 19:05:05 -0400 Received: by mail-pa0-f52.google.com with SMTP id bz2so49848959pad.1 for ; Mon, 13 Jun 2016 16:05:04 -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=9kf6D1JvahHYTdJCN0w7eIlzBty6iL0HH+p0InoAGmc=; b=flD3cVOz+mzOhCjjSDI5GhBBgaTB8wLf2/Fodtum4vcc4p6jlVTIwuvJHcv2/lRIn1 7DI2whv7IsWqcFaF9ZoHeS6o22JOMY6BCoVGdSTWbY/LtQZLxJQgIH3xJkiuoDaZi1Hq Hr/CtRrtCi5O3XhXUTh+kAhRfO1rsbuYVEtZQ= 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=9kf6D1JvahHYTdJCN0w7eIlzBty6iL0HH+p0InoAGmc=; b=mcqgq3RTAGuR4/0fVs4vw4APswUzxt70pdfTMkMUxvqdgdNFSL4u8TDaxLUN+/AJi/ DJfOLsZMEuBmUIKwNKL7Vay06BTl6MFTooB09+Zy8oK25fDNv/4KUZAfAbKxcB5o7G63 +OAj+xOxk2e0+R9L9jJ8XEPZgLAeNVkqql+/WqxeOein0lpKMDPdh+Toij5vJzE/7NPC BM5mJ20u7uTuGgX01FHUhTopiGKcy+WV8k3k7MoXgSx2KIp4D1ubzs1dSPHn/Mws03PF 3F6jJSpcpjjdSsdC4anFjmf1DsJFvMJ/+zBrSDf/yPe6OfrF/2bxVlRBblJPHQ8HP3aa u36g== X-Gm-Message-State: ALyK8tJJDHdtIjqrdG9y+1z2+SzID0o0h1PPnR/crrzJRS7ZZj7zBaZrpf1KmVOM/G6UQs8X X-Received: by 10.66.101.231 with SMTP id fj7mr24140821pab.59.1465859104267; Mon, 13 Jun 2016 16:05:04 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id pk18sm8906434pab.27.2016.06.13.16.05.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jun 2016 16:05:03 -0700 (PDT) From: Douglas Anderson To: ulf.hansson@linaro.org, kishon@ti.com, Heiko Stuebner , robh+dt@kernel.org Cc: 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, Douglas Anderson , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 09/11] phy: rockchip-emmc: Minor code cleanup in rockchip_emmc_phy_power_on/off() Date: Mon, 13 Jun 2016 16:04:33 -0700 Message-Id: <1465859076-4868-10-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1465859076-4868-1-git-send-email-dianders@chromium.org> References: <1465859076-4868-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 Reviewed-by: Shawn Lin Acked-by: Kishon Vijay Abraham I --- 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 = {