torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

net: phy: qca807x: use new phy_package_shared getters

Browse Source 
Use the new getters for members of struct phy_package_shared.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/b6402789-45d2-49d6-835f-ed584bce5b2f@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Heiner Kallweit 2025-03-03 21:16:00 +01:00 committed by Jakub Kicinski
parent 2c8cd9783f
commit 947030f3c3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/phy/qcom/qca807x.c
View File

@ -15,6 +15,7 @@
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/sfp.h> #include <linux/sfp.h>
#include "../phylib.h"
#include "qcom.h" #include "qcom.h"
#define QCA807X_CHIP_CONFIGURATION 0x1f #define QCA807X_CHIP_CONFIGURATION 0x1f
@ -486,13 +487,13 @@ static int qca807x_read_status(struct phy_device *phydev)
static int qca807x_phy_package_probe_once(struct phy_device *phydev) static int qca807x_phy_package_probe_once(struct phy_device *phydev)
{ {
struct phy_package_shared *shared = phydev->shared; struct qca807x_shared_priv *priv = phy_package_get_priv(phydev);
struct qca807x_shared_priv *priv = shared->priv; struct device_node *np = phy_package_get_node(phydev);
unsigned int tx_drive_strength; unsigned int tx_drive_strength;
const char *package_mode_name; const char *package_mode_name;
/* Default to 600mw if not defined */ /* Default to 600mw if not defined */
if (of_property_read_u32(shared->np, "qcom,tx-drive-strength-milliwatt", if (of_property_read_u32(np, "qcom,tx-drive-strength-milliwatt",
&tx_drive_strength)) &tx_drive_strength))
tx_drive_strength = 600; tx_drive_strength = 600;
@ -541,7 +542,7 @@ static int qca807x_phy_package_probe_once(struct phy_device *phydev)
} }
priv->package_mode = PHY_INTERFACE_MODE_NA; priv->package_mode = PHY_INTERFACE_MODE_NA;
if (!of_property_read_string(shared->np, "qcom,package-mode", if (!of_property_read_string(np, "qcom,package-mode",
&package_mode_name)) { &package_mode_name)) {
if (!strcasecmp(package_mode_name, if (!strcasecmp(package_mode_name,
phy_modes(PHY_INTERFACE_MODE_PSGMII))) phy_modes(PHY_INTERFACE_MODE_PSGMII)))
@ -558,8 +559,7 @@ static int qca807x_phy_package_probe_once(struct phy_device *phydev)
static int qca807x_phy_package_config_init_once(struct phy_device *phydev) static int qca807x_phy_package_config_init_once(struct phy_device *phydev)
{ {
struct phy_package_shared *shared = phydev->shared; struct qca807x_shared_priv *priv = phy_package_get_priv(phydev);
struct qca807x_shared_priv *priv = shared->priv;
int val, ret; int val, ret;
/* Make sure PHY follow PHY package mode if enforced */ /* Make sure PHY follow PHY package mode if enforced */
@ -708,7 +708,6 @@ static int qca807x_probe(struct phy_device *phydev)
struct device_node *node = phydev->mdio.dev.of_node; struct device_node *node = phydev->mdio.dev.of_node;
struct qca807x_shared_priv *shared_priv; struct qca807x_shared_priv *shared_priv;
struct device *dev = &phydev->mdio.dev; struct device *dev = &phydev->mdio.dev;
struct phy_package_shared *shared;
struct qca807x_priv *priv; struct qca807x_priv *priv;
int ret; int ret;
@ -722,8 +721,7 @@ static int qca807x_probe(struct phy_device *phydev)
return ret; return ret;
} }
shared = phydev->shared; shared_priv = phy_package_get_priv(phydev);
shared_priv = shared->priv;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)