shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "net: mdio: fix owner field for mdio buses registered using device-tree"

Browse Source 
This reverts commit c2b6e1a440.

It breaks the current Android kernel abi.  It will be brought back at
the next KABI break update.

Bug: 161946584
Change-Id: I0e5a012f184f4d1a8ca158e45fe4a3e4f20050db
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-03-31 08:50:50 +00:00
parent db50ac4d0a
commit d9f36cae1c
3 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/mdio/of_mdio.c
View File

@@ -139,23 +139,21 @@ bool of_mdiobus_child_is_phy(struct device_node *child)
EXPORT_SYMBOL(of_mdiobus_child_is_phy);
/**
* __of_mdiobus_register - Register mii_bus and create PHYs from the device tree
* of_mdiobus_register - Register mii_bus and create PHYs from the device tree
* @mdio: pointer to mii_bus structure
* @np: pointer to device_node of MDIO bus.
* @owner: module owning the @mdio object.
*
* This function registers the mii_bus structure and registers a phy_device
* for each child node of @np.
*/
int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
struct module *owner)
int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
{
struct device_node *child;
bool scanphys = false;
int addr, rc;
if (!np)
return __mdiobus_register(mdio, owner);
return mdiobus_register(mdio);
/* Do not continue if the node is disabled */
if (!of_device_is_available(np))
@@ -174,7 +172,7 @@ int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
of_property_read_u32(np, "reset-post-delay-us", &mdio->reset_post_delay_us);
/* Register the MDIO bus */
rc = __mdiobus_register(mdio, owner);
rc = mdiobus_register(mdio);
if (rc)
return rc;
@@ -238,7 +236,7 @@ unregister:
mdiobus_unregister(mdio);
return rc;
}
EXPORT_SYMBOL(__of_mdiobus_register);
EXPORT_SYMBOL(of_mdiobus_register);
/**
* of_mdio_find_device - Given a device tree node, find the mdio_device

11
drivers/net/phy/mdio_devres.c
View File

@@ -98,14 +98,13 @@ EXPORT_SYMBOL(__devm_mdiobus_register);
#if IS_ENABLED(CONFIG_OF_MDIO)
/**
* __devm_of_mdiobus_register - Resource managed variant of of_mdiobus_register()
* devm_of_mdiobus_register - Resource managed variant of of_mdiobus_register()
* @dev: Device to register mii_bus for
* @mdio: MII bus structure to register
* @np: Device node to parse
* @owner: Owning module
*/
int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
struct device_node *np, struct module *owner)
int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
struct device_node *np)
{
struct mdiobus_devres *dr;
int ret;
@@ -118,7 +117,7 @@ int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
if (!dr)
return -ENOMEM;
ret = __of_mdiobus_register(mdio, np, owner);
ret = of_mdiobus_register(mdio, np);
if (ret) {
devres_free(dr);
return ret;
@@ -128,7 +127,7 @@ int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
devres_add(dev, dr);
return 0;
}
EXPORT_SYMBOL(__devm_of_mdiobus_register);
EXPORT_SYMBOL(devm_of_mdiobus_register);
#endif /* CONFIG_OF_MDIO */
MODULE_LICENSE("GPL");

22
include/linux/of_mdio.h
View File

@@ -14,25 +14,9 @@
#if IS_ENABLED(CONFIG_OF_MDIO)
bool of_mdiobus_child_is_phy(struct device_node *child);
int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np,
struct module *owner);
static inline int of_mdiobus_register(struct mii_bus *mdio,
struct device_node *np)
{
return __of_mdiobus_register(mdio, np, THIS_MODULE);
}
int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
struct device_node *np, struct module *owner);
static inline int devm_of_mdiobus_register(struct device *dev,
struct mii_bus *mdio,
struct device_node *np)
{
return __devm_of_mdiobus_register(dev, mdio, np, THIS_MODULE);
}
int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np);
int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio,
struct device_node *np);
struct mdio_device *of_mdio_find_device(struct device_node *np);
struct phy_device *of_phy_find_device(struct device_node *phy_np);
struct phy_device *