From patchwork Sat Jan 19 09:43:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1027911 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AkMcEA7c"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hXtm6kxwz9sBQ for ; Sat, 19 Jan 2019 20:43:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727709AbfASJnY (ORCPT ); Sat, 19 Jan 2019 04:43:24 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:33565 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726512AbfASJnY (ORCPT ); Sat, 19 Jan 2019 04:43:24 -0500 Received: by mail-wr1-f67.google.com with SMTP id c14so17922729wrr.0 for ; Sat, 19 Jan 2019 01:43:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=cO44/u3OawE6lmfst3G7QnUVXliuSl7DdOfZkKA/nyk=; b=AkMcEA7cz3syviCzVmEbgJVrY0T6x2iKdlfORLWVliJkBQzg3nxbKzfzxEPbzX/vM3 s6klcJGoMeVK8iSLff7wiMQX+UlXoVZscurrKllwsvsMzXRLnQxr83DGRlx9hp3h+loq Wzndf2AQlcdmGZ3buKfEOAeshrJQ6vkyy4oXR/p6Vf23Ks2fPWNwS48Dv3+gZGFlEaPM yN2sqrRowB8LDxHsoMutzXp5pesxml1CYVn01zuIKiJmeJFyRm6/jemvVPiGRZRAKqsF 3w9bHUW1FeIl+FvC+jDFFkGNe2OGzQVuGdi8pz5xOL/1/dZwP8F+W9lJtBkT02iiRftx p9Vg== 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:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=cO44/u3OawE6lmfst3G7QnUVXliuSl7DdOfZkKA/nyk=; b=thBbJNF4m0pMaUEamSZtGvoVRIF2xFpY44Jq1CA9AL9mqryCWOLIMSLYOHwhx9khm3 BZQX/GnrPx++puxSwiLQHfIiD7rXfVakzu4fCZiy2Z6SOflMjs16w/vsr/0iSreUWSIy c1r5TC8iVU9+44we8QayhVPYQ3heFza+X3DUpqvpa8fYAFAj4knF74SZf9nqVx/BRue6 VURWtn9hHD1N9mk8KJfpQt/idDYVpal10Zjmv4GPLfHVRTmz41XOEPrzqctcJ1Ovg4Cv rH9hUShTwx6VVnLYCw5UHJLEjuycdkshDzEqD2b5fQsM0Ok0JanQuHSeTSMrvvFuNY3o 5DAw== X-Gm-Message-State: AJcUukfkgniYVQIwtlMcXHfLIM5tc5JqC4+lCJKiOlQXlU8nVDz3+XpE /NZteYvqCozeRFIN5BkSTotCAh7E X-Google-Smtp-Source: ALg8bN6yAdILihUfPeXcw77aq58oTaf/X6/GzxlLvWMVz3BguGfq+CtecYYtehM6WyvhSp0ksf9LeQ== X-Received: by 2002:adf:ef0d:: with SMTP id e13mr19707506wro.29.1547891001858; Sat, 19 Jan 2019 01:43:21 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:5cdd:5de5:6c17:efb0? (p200300EA8BF1E2005CDD5DE56C17EFB0.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:5cdd:5de5:6c17:efb0]) by smtp.googlemail.com with ESMTPSA id l20sm180611178wrb.93.2019.01.19.01.43.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 01:43:21 -0800 (PST) From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" Subject: [PATCH net-next] net: phy: improve phy_init_hw Message-ID: <813e4167-19ad-4bd1-8eb1-a56662fdca42@gmail.com> Date: Sat, 19 Jan 2019 10:43:07 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently the soft reset (if defined) is done only if the driver also implements the config_init callback. I think this dependency is a mistake, so let's remove it. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index fa98064e5..3d761af0d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1041,7 +1041,7 @@ int phy_init_hw(struct phy_device *phydev) /* Deassert the reset signal */ phy_device_reset(phydev, 0); - if (!phydev->drv || !phydev->drv->config_init) + if (!phydev->drv) return 0; if (phydev->drv->soft_reset) @@ -1054,7 +1054,10 @@ int phy_init_hw(struct phy_device *phydev) if (ret < 0) return ret; - return phydev->drv->config_init(phydev); + if (phydev->drv->config_init) + ret = phydev->drv->config_init(phydev); + + return ret; } EXPORT_SYMBOL(phy_init_hw);