From patchwork Wed Jul 27 06:43:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 12930147 X-Patchwork-Delegate: kuba@kernel.org 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 B1D15C19F21 for ; Wed, 27 Jul 2022 06:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230184AbiG0Gom (ORCPT ); Wed, 27 Jul 2022 02:44:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230161AbiG0GoM (ORCPT ); Wed, 27 Jul 2022 02:44:12 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 639B441983 for ; Tue, 26 Jul 2022 23:43:52 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id q7so3338041ljp.13 for ; Tue, 26 Jul 2022 23:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KjpPOw/EHkdGMlNJx96x3tiCm2I3MhnvsH5Bdl+D29E=; b=eaw0CSRmVCkatxLGZl8bUwnuKZqXHQmUWTrF+8ClFW+gQ+9nkwgzFmxXSTo0VK0RbC aV4dIUCd2t5RH2ECwdVSLNJydWtb7HpjuulvoE7z2UM/j0gCGG++g9KYh2JHI0GNLWBj S6HgOpQZcWXfE7pE1QQVqYk54vEerMk55ek4xUXekKIiojkJBeMT86Fe3eDNe18qyb2g 5TsYchAHEV4HtRX37aQd78d4S5JfwXXH9afyAP+BUzdGemP/K60BZ1wEY1bpyqq9c4Ht M8xbVByvmTcxrdO+Oo1Azy12WA8R3tnv5BnEG6VHhQ6u9zozukNlYH6wfjlRJI618HAe ePQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KjpPOw/EHkdGMlNJx96x3tiCm2I3MhnvsH5Bdl+D29E=; b=e8njfp1Cy96Wyv/9C6m9hpUMBKLyMOUDFLrfWjposolt97p++waY73w8JD9dCZtLF3 JVAVATglx/bwHfQaleHjj/z1BOa8GJVzBDHh2OrQ594MNSvZ7N06xsTAua/VNg0qVKkY e9uOsKoQ7zKXMtQ4hS6l5KKMfA/gRBziK5XXogkYzymWthLSCNDRjjXoSxcGCBIbLGsk JRjIHPeJUYSVo5a+Ola1YEjn/9kDTyzU3RMkI5I9MjNlW1ncO+MjaKdUnsnSxkeQ5QyO vrIHuezN/FzgdmgEAdgQVy7u90CWb9KHZnxHOcXzE6WfIRQwN4hqkJsMxJgC53AQhmMc AjVg== X-Gm-Message-State: AJIora/qVrO/RwMa3yvUYyLPcrq+dhoWr7ws1fBJUexj9BRP43NMIuqd vikTKerOq35ToZhdLw4JjW3m5Q== X-Google-Smtp-Source: AGRyM1s0sRFTSUqI9uwyloFsy7TMvBWrfyPieQcx1tIMUxMjzvRQhRmhkmi48m6OKXIMRsCJE25Y6Q== X-Received: by 2002:a2e:9cd8:0:b0:25e:ec:237c with SMTP id g24-20020a2e9cd8000000b0025e00ec237cmr5283663ljj.277.1658904230528; Tue, 26 Jul 2022 23:43:50 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id w19-20020a05651234d300b0048a97a1df02sm1157231lfr.6.2022.07.26.23.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 23:43:50 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, netdev@vger.kernel.org Cc: rafael@kernel.org, andriy.shevchenko@linux.intel.com, sean.wang@mediatek.com, Landen.Chao@mediatek.com, linus.walleij@linaro.org, andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, olteanv@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux@armlinux.org.uk, hkallweit1@gmail.com, gjb@semihalf.com, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com, Samer.El-Haj-Mahmoud@arm.com, upstream@semihalf.com Subject: [net-next: PATCH v3 8/8] net: dsa: mv88e6xxx: switch to device_/fwnode_ APIs Date: Wed, 27 Jul 2022 08:43:21 +0200 Message-Id: <20220727064321.2953971-9-mw@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20220727064321.2953971-1-mw@semihalf.com> References: <20220727064321.2953971-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org In order to support both DT and ACPI in future, modify the mv88e6xx driver code to use device_/fwnode_ equivalent routines. No functional change is introduced by this patch. Signed-off-by: Marcin Wojtas --- drivers/net/dsa/mv88e6xxx/chip.c | 43 +++++++++----------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index a46ebdfba1c3..e7848b56316f 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3891,10 +3891,11 @@ static int mv88e6xxx_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val) } static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip, - struct device_node *np, + struct fwnode_handle *fwnode, bool external) { static int index; + struct device_node *np = to_of_node(fwnode); struct mv88e6xxx_mdio_bus *mdio_bus; struct mii_bus *bus; int err; @@ -3973,18 +3974,18 @@ static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip) } static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip, - struct device_node *np) + struct fwnode_handle *fwnode) { - struct device_node *child; + struct fwnode_handle *child; int err; /* Always register one mdio bus for the internal/default mdio * bus. This maybe represented in the device tree, but is * optional. */ - child = of_get_child_by_name(np, "mdio"); + child = fwnode_get_named_child_node(fwnode, "mdio"); err = mv88e6xxx_mdio_register(chip, child, false); - of_node_put(child); + fwnode_handle_put(child); if (err) return err; @@ -3992,13 +3993,13 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip, * which say they are compatible with the external mdio * bus. */ - for_each_available_child_of_node(np, child) { - if (of_device_is_compatible( - child, "marvell,mv88e6xxx-mdio-external")) { + fwnode_for_each_available_child_node(fwnode, child) { + if (fwnode_property_match_string(child, "compatible", + "marvell,mv88e6xxx-mdio-external") == 0) { err = mv88e6xxx_mdio_register(chip, child, true); if (err) { mv88e6xxx_mdios_unregister(chip); - of_node_put(child); + fwnode_handle_put(child); return err; } } @@ -6984,20 +6985,16 @@ static SIMPLE_DEV_PM_OPS(mv88e6xxx_pm_ops, mv88e6xxx_suspend, mv88e6xxx_resume); static int mv88e6xxx_probe(struct mdio_device *mdiodev) { struct dsa_mv88e6xxx_pdata *pdata = mdiodev->dev.platform_data; + struct fwnode_handle *fwnode = dev_fwnode(&mdiodev->dev); const struct mv88e6xxx_info *compat_info = NULL; struct device *dev = &mdiodev->dev; - struct device_node *np = dev->of_node; struct mv88e6xxx_chip *chip; int port; int err; - if (!np && !pdata) - return -EINVAL; - - if (np) - compat_info = of_device_get_match_data(dev); - - if (pdata) { + if (fwnode) + compat_info = device_get_match_data(dev); + else if (pdata) { compat_info = pdata_device_get_match_data(dev); if (!pdata->netdev) @@ -7054,9 +7051,9 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) mv88e6xxx_phy_init(chip); if (chip->info->ops->get_eeprom) { - if (np) - of_property_read_u32(np, "eeprom-length", - &chip->eeprom_len); + if (fwnode) + device_property_read_u32(dev, "eeprom-length", + &chip->eeprom_len); else chip->eeprom_len = pdata->eeprom_len; } @@ -7067,8 +7064,8 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) if (err) goto out; - if (np) { - chip->irq = of_irq_get(np, 0); + if (fwnode) { + chip->irq = fwnode_irq_get(fwnode, 0); if (chip->irq == -EPROBE_DEFER) { err = chip->irq; goto out; @@ -7106,7 +7103,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) if (err) goto out_g1_atu_prob_irq; - err = mv88e6xxx_mdios_register(chip, np); + err = mv88e6xxx_mdios_register(chip, fwnode); if (err) goto out_g1_vtu_prob_irq;