|
@@ -437,23 +437,18 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
|
|
|
int id;
|
|
|
struct phy *phy;
|
|
|
|
|
|
- if (!dev) {
|
|
|
- dev_WARN(dev, "no device provided for PHY\n");
|
|
|
- ret = -EINVAL;
|
|
|
- goto err0;
|
|
|
- }
|
|
|
+ if (WARN_ON(!dev))
|
|
|
+ return ERR_PTR(-EINVAL);
|
|
|
|
|
|
phy = kzalloc(sizeof(*phy), GFP_KERNEL);
|
|
|
- if (!phy) {
|
|
|
- ret = -ENOMEM;
|
|
|
- goto err0;
|
|
|
- }
|
|
|
+ if (!phy)
|
|
|
+ return ERR_PTR(-ENOMEM);
|
|
|
|
|
|
id = ida_simple_get(&phy_ida, 0, 0, GFP_KERNEL);
|
|
|
if (id < 0) {
|
|
|
dev_err(dev, "unable to get id\n");
|
|
|
ret = id;
|
|
|
- goto err1;
|
|
|
+ goto free_phy;
|
|
|
}
|
|
|
|
|
|
device_initialize(&phy->dev);
|
|
@@ -468,11 +463,11 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
|
|
|
|
|
|
ret = dev_set_name(&phy->dev, "phy-%s.%d", dev_name(dev), id);
|
|
|
if (ret)
|
|
|
- goto err2;
|
|
|
+ goto put_dev;
|
|
|
|
|
|
ret = device_add(&phy->dev);
|
|
|
if (ret)
|
|
|
- goto err2;
|
|
|
+ goto put_dev;
|
|
|
|
|
|
if (pm_runtime_enabled(dev)) {
|
|
|
pm_runtime_enable(&phy->dev);
|
|
@@ -481,12 +476,11 @@ struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
|
|
|
|
|
|
return phy;
|
|
|
|
|
|
-err2:
|
|
|
- ida_remove(&phy_ida, phy->id);
|
|
|
+put_dev:
|
|
|
put_device(&phy->dev);
|
|
|
-err1:
|
|
|
+ ida_remove(&phy_ida, phy->id);
|
|
|
+free_phy:
|
|
|
kfree(phy);
|
|
|
-err0:
|
|
|
return ERR_PTR(ret);
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(phy_create);
|