[PATCH 1/2] phy: spear1310-miphy: Return proper error for spear1310_miphy_xlate

[PATCH 1/2] phy: spear1310-miphy: Return proper error for spear1310_miphy_xlate

[Axel Lin]

The of_xlate callback should return ERR_PTR on error.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/phy/phy-spear1310-miphy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-spear1310-miphy.c b/drivers/phy/phy-spear1310-miphy.c
index 9f47fae..4684b04 100644
--- a/drivers/phy/phy-spear1310-miphy.c
+++ b/drivers/phy/phy-spear1310-miphy.c
@@ -192,14 +192,14 @@ static struct phy *spear1310_miphy_xlate(struct device *dev,
 
 	if (args->args_count < 1) {
 		dev_err(dev, "DT did not pass correct no of args\n");
-		return NULL;
+		return ERR_PTR(-EINVAL);
 	}
 
 	priv->mode = args->args[0];
 
 	if (priv->mode != SATA && priv->mode != PCIE) {
 		dev_err(dev, "DT did not pass correct phy mode\n");
-		return NULL;
+		return ERR_PTR(-EINVAL);
 	}
 
 	return priv->phy;
-- 
1.9.1

[PATCH 2/2] phy: spear1340-miphy: Return proper error for spear1340_miphy_xlate

[Axel Lin]

The of_xlate callback should return ERR_PTR on error.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/phy/phy-spear1340-miphy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-spear1340-miphy.c b/drivers/phy/phy-spear1340-miphy.c
index e42bc20..210979b 100644
--- a/drivers/phy/phy-spear1340-miphy.c
+++ b/drivers/phy/phy-spear1340-miphy.c
@@ -229,14 +229,14 @@ static struct phy *spear1340_miphy_xlate(struct device *dev,
 
 	if (args->args_count < 1) {
 		dev_err(dev, "DT did not pass correct no of args\n");
-		return NULL;
+		return ERR_PTR(-EINVAL);
 	}
 
 	priv->mode = args->args[0];
 
 	if (priv->mode != SATA && priv->mode != PCIE) {
 		dev_err(dev, "DT did not pass correct phy mode\n");
-		return NULL;
+		return ERR_PTR(-EINVAL);
 	}
 
 	return priv->phy;
-- 
1.9.1

Re: [PATCH 1/2] phy: spear1310-miphy: Return proper error for spear1310_miphy_xlate

[Kishon Vijay Abraham I]

Hi,

On Wednesday 25 March 2015 02:31 PM, Axel Lin wrote:
> The of_xlate callback should return ERR_PTR on error.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
>   drivers/phy/phy-spear1310-miphy.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/phy-spear1310-miphy.c b/drivers/phy/phy-spear1310-miphy.c
> index 9f47fae..4684b04 100644
> --- a/drivers/phy/phy-spear1310-miphy.c
> +++ b/drivers/phy/phy-spear1310-miphy.c
> @@ -192,14 +192,14 @@ static struct phy *spear1310_miphy_xlate(struct device *dev,
>
>   	if (args->args_count < 1) {
>   		dev_err(dev, "DT did not pass correct no of args\n");
> -		return NULL;
> +		return ERR_PTR(-EINVAL);

It should actually be -ENODEV so that phy_optional_get() doesn't fail.
>   	}
>
>   	priv->mode = args->args[0];
>
>   	if (priv->mode != SATA && priv->mode != PCIE) {
>   		dev_err(dev, "DT did not pass correct phy mode\n");
> -		return NULL;
> +		return ERR_PTR(-EINVAL);

Same here.

Thanks
Kishon