|
@@ -1157,20 +1157,17 @@ struct device *omap_device_get_by_hwmod_name(const char *oh_name)
|
|
|
}
|
|
|
|
|
|
oh = omap_hwmod_lookup(oh_name);
|
|
|
- if (IS_ERR_OR_NULL(oh)) {
|
|
|
+ if (!oh) {
|
|
|
WARN(1, "%s: no hwmod for %s\n", __func__,
|
|
|
oh_name);
|
|
|
- return ERR_PTR(oh ? PTR_ERR(oh) : -ENODEV);
|
|
|
+ return ERR_PTR(-ENODEV);
|
|
|
}
|
|
|
- if (IS_ERR_OR_NULL(oh->od)) {
|
|
|
+ if (!oh->od) {
|
|
|
WARN(1, "%s: no omap_device for %s\n", __func__,
|
|
|
oh_name);
|
|
|
- return ERR_PTR(oh->od ? PTR_ERR(oh->od) : -ENODEV);
|
|
|
+ return ERR_PTR(-ENODEV);
|
|
|
}
|
|
|
|
|
|
- if (IS_ERR_OR_NULL(oh->od->pdev))
|
|
|
- return ERR_PTR(oh->od->pdev ? PTR_ERR(oh->od->pdev) : -ENODEV);
|
|
|
-
|
|
|
return &oh->od->pdev->dev;
|
|
|
}
|
|
|
EXPORT_SYMBOL(omap_device_get_by_hwmod_name);
|