diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-24 10:42:27 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-24 10:42:27 +0000 |
commit | b269b1709d17794bef0397b3de7d1db72bdef926 (patch) | |
tree | 799a3184261d4b6960ceb2045d465498846375c9 /arch/arm/mach-ux500/cpu.c | |
parent | f6604efe0bee759f4db34757f2872b611288ef0f (diff) |
ARM: cleanup: soc_device_register() error checking
soc_device_register() never returns NULL, it only ever returns an
error pointer or a valid pointer. Use the right function (IS_ERR())
to check this.
soc_device_to_device() only ever returns &soc_dev->dev, and so can
never return an error or NULL if the pointer passed into it was
valid, so there's no point checking its return.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r-- | arch/arm/mach-ux500/cpu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 721e7b4275f3..a48026651504 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -145,14 +145,13 @@ struct device * __init ux500_soc_device_init(const char *soc_id) soc_info_populate(soc_dev_attr, soc_id); soc_dev = soc_device_register(soc_dev_attr); - if (IS_ERR_OR_NULL(soc_dev)) { + if (IS_ERR(soc_dev)) { kfree(soc_dev_attr); return NULL; } parent = soc_device_to_device(soc_dev); - if (!IS_ERR_OR_NULL(parent)) - device_create_file(parent, &ux500_soc_attr); + device_create_file(parent, &ux500_soc_attr); return parent; } |