Skip to content

Commit

Permalink
drivers: phy: Make NULL a valid phy reference
Browse files Browse the repository at this point in the history
The common clock framework considers NULL a valid clock
reference. This makes handling optional clocks simple, in that if the
optional clock is not available, a NULL reference can be used in the
place of a real clock, simplifying the clock consumer.

Extend this concept to the phy consumer API. A NULL can be passed to
the release calls, the phy_init() and phy_exit() calls, and
phy_power_on() and phy_power_off() and a NOP is performed.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Andrew Lunn authored and Jason Cooper committed Feb 5, 2014
1 parent 38dbfb5 commit 04c2fac
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Documentation/phy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ The only difference between the two APIs is that devm_phy_get associates the
device with the PHY using devres on successful PHY get. On driver detach,
release function is invoked on the the devres data and devres data is freed.

It should be noted that NULL is a valid phy reference. All phy
consumer calls on the NULL phy become NOPs. That is the release calls,
the phy_init() and phy_exit() calls, and phy_power_on() and
phy_power_off() calls are all NOP when applied to a NULL phy. The NULL
phy is useful in devices for handling optional phy devices.

5. Releasing a reference to the PHY

When the controller no longer needs the PHY, it has to release the reference
Expand Down
17 changes: 16 additions & 1 deletion drivers/phy/phy-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ int phy_init(struct phy *phy)
{
int ret;

if (!phy)
return 0;

ret = phy_pm_runtime_get_sync(phy);
if (ret < 0 && ret != -ENOTSUPP)
return ret;
Expand All @@ -187,6 +190,9 @@ int phy_exit(struct phy *phy)
{
int ret;

if (!phy)
return 0;

ret = phy_pm_runtime_get_sync(phy);
if (ret < 0 && ret != -ENOTSUPP)
return ret;
Expand All @@ -212,6 +218,9 @@ int phy_power_on(struct phy *phy)
{
int ret;

if (!phy)
return 0;

ret = phy_pm_runtime_get_sync(phy);
if (ret < 0 && ret != -ENOTSUPP)
return ret;
Expand Down Expand Up @@ -240,6 +249,9 @@ int phy_power_off(struct phy *phy)
{
int ret;

if (!phy)
return 0;

mutex_lock(&phy->mutex);
if (phy->power_count == 1 && phy->ops->power_off) {
ret = phy->ops->power_off(phy);
Expand Down Expand Up @@ -308,7 +320,7 @@ static struct phy *of_phy_get(struct device *dev, int index)
*/
void phy_put(struct phy *phy)
{
if (IS_ERR(phy))
if (!phy || IS_ERR(phy))
return;

module_put(phy->ops->owner);
Expand All @@ -328,6 +340,9 @@ void devm_phy_put(struct device *dev, struct phy *phy)
{
int r;

if (!phy)
return;

r = devres_destroy(dev, devm_phy_release, devm_phy_match, phy);
dev_WARN_ONCE(dev, r, "couldn't find PHY resource\n");
}
Expand Down

0 comments on commit 04c2fac

Please sign in to comment.