From patchwork Sun Oct 1 11:02:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820257 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lWxRMWQi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j742FV2z9t2f for ; Sun, 1 Oct 2017 22:02:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751312AbdJALCW (ORCPT ); Sun, 1 Oct 2017 07:02:22 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33821 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751089AbdJALCS (ORCPT ); Sun, 1 Oct 2017 07:02:18 -0400 Received: by mail-wm0-f67.google.com with SMTP id i131so1869742wma.1 for ; Sun, 01 Oct 2017 04:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LHSwu0kDoG8CQPwwMaYVEWdpnTLkP9tgb/I9i9hFEgQ=; b=lWxRMWQiOu9idTooLp447+ZhH72RFHwye+3eGFWcCKzmxq/wm/n7SH7Pp8hy+Yzv9W vsfz5pejNJiaCfJ4MbRVS6YsvmThFkBs5g4wzVKQOwBhTZHMye/zhJIzuzv1BDmgvRlc 2PFOOc2LxyoyctQk9rStfVuw6rRIipMZ1btoyvb5aF2eQNjk3u0+VogMKin2MVfN0JR3 doxlIs4rKBvSZMmC1fPr2jCnQPZHcvmUsx3cfcXPU8bK8wDbfIjHrg2q1KnI/IBAloNn AlHmg63vX+XBYF9lsBYY0I6HOCyverTc3tgk6EeatSccXWtmuIZWyqxXxwWHtdGRdzRf ahhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LHSwu0kDoG8CQPwwMaYVEWdpnTLkP9tgb/I9i9hFEgQ=; b=AocR+mzwinb4GfmnslbAQAGL8HH3FPumgRsFxf2ZJD91f2jiRcc71se+Fg4dWfwUw3 xxMx5XNkw3q2BSv9hRDb/pi+08n+T+6zmPYtsDwBVai38jNeHS3iLRWrVD35IAKPCe2k GgB+I4cXM20WT7jesZq+M6dmR2WOWt5/jVPFdpJUAO22i2qe+XFBDLwsPdBvgMbQw0lB T427aT/PB3+h/fjLhZyeWr779GcIv6QphH3lXl+5Qxqi7W387P58/4PXgfcEk64wDjfC qjY/iX7IAmWjmIlq0E8O7srFRz5SMjhnTq6AgKcOLqnsBgJI2RRH07Yg7hcbFGE9GwaE Wyig== X-Gm-Message-State: AHPjjUiJghH/PQCRRrq5m4MEXsFEGUflMgON5V4S4qQVsLfjmk6I9CbD WpSEw2WBgJs7G8GIiGrHUXAxpw== X-Google-Smtp-Source: AOwi7QDTlHlT4RFAwxj249WTl40CQD1gm2zdewJTaJKSa9LB/hwgNDdf9/8P49nZgaz+SFvyNAc7EQ== X-Received: by 10.80.216.200 with SMTP id y8mr16622060edj.24.1506855736647; Sun, 01 Oct 2017 04:02:16 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:16 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 5/6] bcm63xx_enet: drop unneeded NULL phy_clk check Date: Sun, 1 Oct 2017 13:02:19 +0200 Message-Id: <20171001110220.27668-6-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org clk_disable and clk_unprepare are NULL-safe, so need to duplicate the NULL check of the functions. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 059ef4f1d137..f6bc13fe8a99 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1903,8 +1903,7 @@ static int bcm_enet_probe(struct platform_device *pdev) out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); - if (priv->phy_clk) - clk_disable_unprepare(priv->phy_clk); + clk_disable_unprepare(priv->phy_clk); out_disable_clk_mac: clk_disable_unprepare(priv->mac_clk); @@ -1943,9 +1942,7 @@ static int bcm_enet_remove(struct platform_device *pdev) } /* disable hw block clocks */ - if (priv->phy_clk) - clk_disable_unprepare(priv->phy_clk); - + clk_disable_unprepare(priv->phy_clk); clk_disable_unprepare(priv->mac_clk); free_netdev(dev);