aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2014-11-13 06:47:43 -0500
committerKishon Vijay Abraham I <kishon@ti.com>2014-11-26 00:37:13 -0500
commitc1fc0050102150481ad4ba7e6449b3aa6e88d6e5 (patch)
tree71acad5592486cb83bf31712e0922c0d9acc0d96
parent556186a02c441e8fb03aa4c87d39bdc8ef95820e (diff)
phy: Use PTR_ERR_OR_ZERO to fix warning raised by coccinelle
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Generated by: coccinelle/api/ptr_ret.cocci Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r--drivers/phy/phy-berlin-sata.c5
-rw-r--r--drivers/phy/phy-hix5hd2-sata.c5
-rw-r--r--drivers/phy/phy-miphy365x.c5
-rw-r--r--drivers/phy/phy-stih41x-usb.c5
4 files changed, 4 insertions, 16 deletions
diff --git a/drivers/phy/phy-berlin-sata.c b/drivers/phy/phy-berlin-sata.c
index 3e599dc96164..099eee8851e5 100644
--- a/drivers/phy/phy-berlin-sata.c
+++ b/drivers/phy/phy-berlin-sata.c
@@ -268,10 +268,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)
268 268
269 phy_provider = 269 phy_provider =
270 devm_of_phy_provider_register(dev, phy_berlin_sata_phy_xlate); 270 devm_of_phy_provider_register(dev, phy_berlin_sata_phy_xlate);
271 if (IS_ERR(phy_provider)) 271 return PTR_ERR_OR_ZERO(phy_provider);
272 return PTR_ERR(phy_provider);
273
274 return 0;
275} 272}
276 273
277static const struct of_device_id phy_berlin_sata_of_match[] = { 274static const struct of_device_id phy_berlin_sata_of_match[] = {
diff --git a/drivers/phy/phy-hix5hd2-sata.c b/drivers/phy/phy-hix5hd2-sata.c
index a80ff9d7fe15..34915b4202f1 100644
--- a/drivers/phy/phy-hix5hd2-sata.c
+++ b/drivers/phy/phy-hix5hd2-sata.c
@@ -164,10 +164,7 @@ static int hix5hd2_sata_phy_probe(struct platform_device *pdev)
164 164
165 phy_set_drvdata(phy, priv); 165 phy_set_drvdata(phy, priv);
166 phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); 166 phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
167 if (IS_ERR(phy_provider)) 167 return PTR_ERR_OR_ZERO(phy_provider);
168 return PTR_ERR(phy_provider);
169
170 return 0;
171} 168}
172 169
173static const struct of_device_id hix5hd2_sata_phy_of_match[] = { 170static const struct of_device_id hix5hd2_sata_phy_of_match[] = {
diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
index 239930edfe1d..6ab43a814ad2 100644
--- a/drivers/phy/phy-miphy365x.c
+++ b/drivers/phy/phy-miphy365x.c
@@ -610,10 +610,7 @@ static int miphy365x_probe(struct platform_device *pdev)
610 } 610 }
611 611
612 provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate); 612 provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
613 if (IS_ERR(provider)) 613 return PTR_ERR_OR_ZERO(provider);
614 return PTR_ERR(provider);
615
616 return 0;
617} 614}
618 615
619static const struct of_device_id miphy365x_of_match[] = { 616static const struct of_device_id miphy365x_of_match[] = {
diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
index 4ab581eadacf..a603801293ff 100644
--- a/drivers/phy/phy-stih41x-usb.c
+++ b/drivers/phy/phy-stih41x-usb.c
@@ -160,10 +160,7 @@ static int stih41x_usb_phy_probe(struct platform_device *pdev)
160 phy_set_drvdata(phy, phy_dev); 160 phy_set_drvdata(phy, phy_dev);
161 161
162 phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); 162 phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
163 if (IS_ERR(phy_provider)) 163 return PTR_ERR_OR_ZERO(phy_provider);
164 return PTR_ERR(phy_provider);
165
166 return 0;
167} 164}
168 165
169static const struct of_device_id stih41x_usb_phy_of_match[] = { 166static const struct of_device_id stih41x_usb_phy_of_match[] = {