| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220715085012.2630214-9-mw@semihalf.com>
Date: Fri, 15 Jul 2022 10:50:12 +0200
From: Marcin Wojtas <mw@...ihalf.com>
To: linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org,
netdev@...r.kernel.org
Cc: rafael@...nel.org, andriy.shevchenko@...ux.intel.com,
sean.wang@...iatek.com, Landen.Chao@...iatek.com,
linus.walleij@...aro.org, andrew@...n.ch, vivien.didelot@...il.com,
f.fainelli@...il.com, olteanv@...il.com, davem@...emloft.net,
edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com,
linux@...linux.org.uk, hkallweit1@...il.com, gjb@...ihalf.com,
mw@...ihalf.com, jaz@...ihalf.com, tn@...ihalf.com,
Samer.El-Haj-Mahmoud@....com, upstream@...ihalf.com
Subject: [net-next: PATCH v2 8/8] net: dsa: mv88e6xxx: switch to device_/fwnode_ APIs
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 <mw@...ihalf.com>
---
drivers/net/dsa/mv88e6xxx/chip.c | 57 ++++++++++----------
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 1baf07b3284b..ca9ae691573e 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3312,7 +3312,7 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)
static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
{
- struct device_node *phy_handle = NULL;
+ struct fwnode_handle *phy_handle = NULL;
struct dsa_switch *ds = chip->ds;
struct dsa_port *dp;
int tx_amp;
@@ -3499,15 +3499,15 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
if (chip->info->ops->serdes_set_tx_amplitude) {
if (dp)
- phy_handle = of_parse_phandle(to_of_node(dp->fwnode), "phy-handle", 0);
+ phy_handle = fwnode_find_reference(dp->fwnode, "phy-handle", 0);
- if (phy_handle && !of_property_read_u32(phy_handle,
- "tx-p2p-microvolt",
- &tx_amp))
+ if (!IS_ERR(phy_handle) && !fwnode_property_read_u32(phy_handle,
+ "tx-p2p-microvolt",
+ &tx_amp))
err = chip->info->ops->serdes_set_tx_amplitude(chip,
port, tx_amp);
- if (phy_handle) {
- of_node_put(phy_handle);
+ if (!IS_ERR(phy_handle)) {
+ fwnode_handle_put(phy_handle);
if (err)
return err;
}
@@ -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;
}
}
@@ -6975,20 +6976,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)
@@ -7045,9 +7042,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;
}
@@ -7058,8 +7055,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;
@@ -7097,7 +7094,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;
--
2.29.0
Powered by blists - more mailing lists