From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4977EC64EC4 for ; Wed, 8 Mar 2023 20:22:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230290AbjCHUWj (ORCPT ); Wed, 8 Mar 2023 15:22:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230186AbjCHUWa (ORCPT ); Wed, 8 Mar 2023 15:22:30 -0500 Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F33F7D13E9 for ; Wed, 8 Mar 2023 12:22:08 -0800 (PST) Received: by mail-qt1-x829.google.com with SMTP id s12so19455986qtq.11 for ; Wed, 08 Mar 2023 12:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678306928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rlftmzmwWD7xg6TuqYacrBL3Kv3aUcQLEUBIXLbdl4E=; b=fmuvGwpEqK2wrmTN7oEvW8EuzjJ7BfXV3y1geVWOsvnUBWXduth9kbw2lG/XfhxEVg +I0XKF3FGdElkW5blAjff/xs1E+BNkJ5ze91E8b6QnsAl/XctXC1L28rQUJYg6Y8ivwQ WSvUm2JVbze41RCJwhbodmkxkvMQnM51jEFFY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678306928; h=content-transfer-encoding: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=rlftmzmwWD7xg6TuqYacrBL3Kv3aUcQLEUBIXLbdl4E=; b=fLtvAp22ZSgb3eZT10iUnkRFk+0tBWkSc4A3G4RnJO13AofY9VKQ9ucbgxY06ZHTZM 0ePB2DOn1OBzHY5pmufvn7uwCAM4c4FyXrZjQg4XftZWvGNYUqeTN9fRIa/UbhdXQvLj 6ocCjUQj0Kjcpv9oq1v+DQ9bsFZgIXWhGv82t8PDSFr28zpycu0AAHNekim2HO0NqnOo ldovQmDRLBEy5Bgjd2IvJfmu8hp9BGsoQKfum+jIpJ7mGj9pOQkcQjIn76snCiyEUjlS HGzRM2rlRVNvq+/BPYcNQ8VCReU5J7NfAq9qjAGpTjZuCZj9BpJJqhG/ZVi9yZOa+EWR GUNQ== X-Gm-Message-State: AO0yUKXf8lT33u93vmuJ785YbcGsqyX99UklzM0mT2YNaSrNgynEIC76 sTCn9OKoKkLSYTK3qsxD4zO9MQ== X-Google-Smtp-Source: AK7set/HekkajRV6sKRUXEb32/ZQ6DPiE7DtaHCsLB5sc85jlj9/9XZYIN8SD55u/0yz9IxOFWQnzA== X-Received: by 2002:a05:622a:144c:b0:3bf:c458:3b0c with SMTP id v12-20020a05622a144c00b003bfc4583b0cmr32457997qtx.30.1678306928057; Wed, 08 Mar 2023 12:22:08 -0800 (PST) Received: from grundler-glapstation.lan ([70.134.62.80]) by smtp.gmail.com with ESMTPSA id e16-20020ac84150000000b003b84b92052asm12180969qtm.57.2023.03.08.12.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 12:22:07 -0800 (PST) From: Grant Grundler To: Oleksij Rempel , Pavel Skripkin , Lukas Wunner Cc: Eizan Miyamoto , Jakub Kicinski , netdev , "David S . Miller" , LKML , Grant Grundler Subject: [PATCHv3 net 2/2] net: asix: init mdiobus from one function Date: Wed, 8 Mar 2023 12:21:59 -0800 Message-Id: <20230308202159.2419227-2-grundler@chromium.org> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog In-Reply-To: <20230308202159.2419227-1-grundler@chromium.org> References: <20230308202159.2419227-1-grundler@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make asix driver consistent with other drivers (e.g. tg3 and r8169) which use mdiobus calls: setup and tear down be handled in one function each. Signed-off-by: Grant Grundler --- drivers/net/usb/asix_devices.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) V3: rebase against netdev/net.git add missing whitespace around "=" diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 538c84909913..9a1e54ef4ff0 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -663,7 +663,7 @@ static int asix_resume(struct usb_interface *intf) return usbnet_resume(intf); } -static int ax88772_init_mdio(struct usbnet *dev) +static int ax88772_mdio_register(struct usbnet *dev) { struct asix_common_private *priv = dev->driver_priv; int ret; @@ -683,10 +683,22 @@ static int ax88772_init_mdio(struct usbnet *dev) ret = mdiobus_register(priv->mdio); if (ret) { netdev_err(dev->net, "Could not register MDIO bus (err %d)\n", ret); - mdiobus_free(priv->mdio); - priv->mdio = NULL; + goto mdio_register_err; } + priv->phydev = mdiobus_get_phy(priv->mdio, priv->phy_addr); + if (!priv->phydev) { + netdev_err(dev->net, "Could not find PHY\n"); + ret = -ENODEV; + goto mdio_phy_err; + } + + return 0; + +mdio_phy_err: + mdiobus_unregister(priv->mdio); +mdio_register_err: + mdiobus_free(priv->mdio); return ret; } @@ -701,13 +713,6 @@ static int ax88772_init_phy(struct usbnet *dev) struct asix_common_private *priv = dev->driver_priv; int ret; - priv->phydev = mdiobus_get_phy(priv->mdio, priv->phy_addr); - if (!priv->phydev) { - netdev_err(dev->net, "Could not find PHY\n"); - ax88772_mdio_unregister(priv); - return -ENODEV; - } - ret = phylink_connect_phy(priv->phylink, priv->phydev); if (ret) { netdev_err(dev->net, "Could not connect PHY\n"); @@ -909,7 +914,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) priv->presvd_phy_bmcr = 0; priv->presvd_phy_advertise = 0; - ret = ax88772_init_mdio(dev); + ret = ax88772_mdio_register(dev); if (ret) return ret; -- 2.40.0.rc0.216.gc4246ad0f0-goog