Skip to content

Commit 857835c

Browse files
author
Russell King
committed
ARM: cleanup: OMAP hwmod error checking
omap_hwmod_lookup() only returns NULL on error, never an error pointer. Checking the returned pointer using IS_ERR_OR_NULL() is needless overhead. Use a simple !ptr check instead. OMAP devices (oh->od) always have a valid platform device attached (see omap_device_alloc()) so there's no point validating the platform device pointer (we will have already oopsed long before if this is not the case here.) Lastly, oh->od is only ever NULL or a valid omap device pointer - 'oh' comes from the statically declared hwmod tables, and the pointer is only filled in by omap_device_alloc() at a point where the omap device pointer must be valid. Signed-off-by: Russell King <[email protected]>
1 parent 62f0f39 commit 857835c

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

arch/arm/mach-omap2/omap_device.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,20 +1157,17 @@ struct device *omap_device_get_by_hwmod_name(const char *oh_name)
11571157
}
11581158

11591159
oh = omap_hwmod_lookup(oh_name);
1160-
if (IS_ERR_OR_NULL(oh)) {
1160+
if (!oh) {
11611161
WARN(1, "%s: no hwmod for %s\n", __func__,
11621162
oh_name);
1163-
return ERR_PTR(oh ? PTR_ERR(oh) : -ENODEV);
1163+
return ERR_PTR(-ENODEV);
11641164
}
1165-
if (IS_ERR_OR_NULL(oh->od)) {
1165+
if (!oh->od) {
11661166
WARN(1, "%s: no omap_device for %s\n", __func__,
11671167
oh_name);
1168-
return ERR_PTR(oh->od ? PTR_ERR(oh->od) : -ENODEV);
1168+
return ERR_PTR(-ENODEV);
11691169
}
11701170

1171-
if (IS_ERR_OR_NULL(oh->od->pdev))
1172-
return ERR_PTR(oh->od->pdev ? PTR_ERR(oh->od->pdev) : -ENODEV);
1173-
11741171
return &oh->od->pdev->dev;
11751172
}
11761173
EXPORT_SYMBOL(omap_device_get_by_hwmod_name);

0 commit comments

Comments
 (0)