From patchwork Mon Mar 25 19:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Chen X-Patchwork-Id: 13602812 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BF0A199B4 for ; Mon, 25 Mar 2024 19:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711395048; cv=none; b=uNYjWBKy8gPASM0kmEuQJPeVs+QOsladZsluTQnGsPpk+qwcR8+COqK2SVcCgoKrt8zV1o/r8KX24XyarQZqdh3V8Z2bI+UqrTtSk/ZzCoq/RmgR9xRTs8wI/oP2+rULoStwnZ8oZJWt/T48IiHsj6fYZnMF9cpwLMiCiwUR3rI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711395048; c=relaxed/simple; bh=BlOcHiv9z5XeQvVgYenfdbJlonvZWiXF6IudynQnPD4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=RXRsdj/KnB4FpL0+J072h+EYuVttCPMQKg3zb/+Cp9cjjQkEJK52NnxfQxNbaa0XvZ8qI9B4eeyNhhVuTAPAo1PP5WD23hFqVVBeoK1sR9MRw24zz9jDsLxUk31G0e6VQf3S+pLChDohzxULEuTM0E9CiT/tbtVzJxdnSlz2ZIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=QJ7F4zBK; arc=none smtp.client-ip=209.85.160.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="QJ7F4zBK" Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-229cbc52318so2106367fac.2 for ; Mon, 25 Mar 2024 12:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1711395045; x=1711999845; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=G91K+G/ygSra0QGB2/Lw74OkLYKaxosUW0bcOwmdL0o=; b=QJ7F4zBKoyp3olwx7appvWTsQwuLvwo/ScceoGHgArdbO28cDpfvysGUertxGuFxts jsbcc/uoh2pc5sdlrlVPOVvAqioHT+v0ATqqbFhTN5pgbDW6Jz5BGJ1imwBo3HyduM/7 Ui1mW4CT36VjEd76UaLSw7pra6hFsvrRzW3bY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711395045; x=1711999845; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=G91K+G/ygSra0QGB2/Lw74OkLYKaxosUW0bcOwmdL0o=; b=POC4zEu8KTD2rzmJZUKIbswL1NNDkWBrNs55yLNO/RWobzxUpX3L1JrZD4zGZfmfWL /+VgSMGE5hN1D+aCmWCdazUJwIGNdSg/1ijny6piux4NJ0NAI33XFqhBmWcxPRp7N1aM dJSWxbvVQqXPqaoIc7/eu2ugJTGVS+AAWFxMWgSStOzMNEB7MyaXrArq8UfE1w15i2k7 YsV24V37dor7P+0hz5WAxSAOPSKwlgV4eHvM5n39p4wmnNsOTvsvHv/iwflcYbLlHp8N hmxmo01L7SV+vwYYpHm8VQNl3wT8Dfhou3NUoooLSnG+jWSt4BW/l3wreAHQABX2xvq6 ia9w== X-Gm-Message-State: AOJu0YyRlB7KVTrAyuxZdN0++lVK2zwxm8h5WugglfI59cmLxvRPUc6y 3oQnFKgw+sYYw4PcUOoEK11fzm3JPK8Qw5Km8I9I1h4D9MIB9o5jyLJaVFM3zeJiDFp4lk0yeY3 iQyP0eNqIR9eI0bnIfwd0G3KW1yRZFR8YRPaPBjAUwY2Q3/708wGrGVw902RExF3e8vXJaBhXH5 FzHG11mmQhrWBkr9YsiTF/TLxtHtmcKrL83Y8O2oZRTg== X-Google-Smtp-Source: AGHT+IFbBIi+0OC2jKcDAB8WNuQVZnOcBoIEn+b8AT9X1U+mQaE5xXKcx99IIeSJW6c+xPahOVJgHA== X-Received: by 2002:a05:6870:14d6:b0:229:f230:ea37 with SMTP id l22-20020a05687014d600b00229f230ea37mr8552317oab.20.1711395045271; Mon, 25 Mar 2024 12:30:45 -0700 (PDT) Received: from stbirv-lnx-1.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id ey5-20020a05622a4c0500b00431612e7111sm689448qtb.41.2024.03.25.12.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 12:30:45 -0700 (PDT) From: Justin Chen To: netdev@vger.kernel.org Cc: florian.fainelli@broadcom.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, bcm-kernel-feedback-list@broadcom.com, opendmb@gmail.com, Justin Chen Subject: [PATCH net 2/2] net: bcmasp: Remove phy_{suspend/resume} Date: Mon, 25 Mar 2024 12:30:25 -0700 Message-Id: <20240325193025.1540737-3-justin.chen@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240325193025.1540737-1-justin.chen@broadcom.com> References: <20240325193025.1540737-1-justin.chen@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org phy_{suspend/resume} is redundant. It gets called from phy_{stop/start}. Fixes: 490cb412007d ("net: bcmasp: Add support for ASP2.0 Ethernet controller") Signed-off-by: Justin Chen --- drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c index 34e5156762a8..72ea97c5d5d4 100644 --- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c +++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c @@ -1044,10 +1044,6 @@ static int bcmasp_netif_init(struct net_device *dev, bool phy_connect) /* Indicate that the MAC is responsible for PHY PM */ phydev->mac_managed_pm = true; - } else if (!intf->wolopts) { - ret = phy_resume(dev->phydev); - if (ret) - goto err_phy_disable; } umac_reset(intf); @@ -1334,7 +1330,6 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf) { struct device *kdev = &intf->parent->pdev->dev; struct net_device *dev = intf->ndev; - int ret = 0; if (!netif_running(dev)) return 0; @@ -1344,10 +1339,6 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf) bcmasp_netif_deinit(dev); if (!intf->wolopts) { - ret = phy_suspend(dev->phydev); - if (ret) - goto out; - if (intf->internal_phy) bcmasp_ephy_enable_set(intf, false); else @@ -1364,11 +1355,7 @@ int bcmasp_interface_suspend(struct bcmasp_intf *intf) clk_disable_unprepare(intf->parent->clk); - return ret; - -out: - bcmasp_netif_init(dev, false); - return ret; + return 0; } static void bcmasp_resume_from_wol(struct bcmasp_intf *intf)