diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:36:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:36:41 +0200 |
| commit | 877cd7ae0d4cc5549ca3f9137ef7a3ee40b7a244 (patch) | |
| tree | 2768dd3fe540f233d4efbd3192c23a3f9d911fd4 | |
| parent | Merge tag 'renesas-arm64-defconfig-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc (diff) | |
| parent | ARM: vexpress/spc: Delete an error message for a failed memory allocation (diff) | |
| download | linux-dev-877cd7ae0d4cc5549ca3f9137ef7a3ee40b7a244.tar.xz linux-dev-877cd7ae0d4cc5549ca3f9137ef7a3ee40b7a244.zip | |
Merge tag 'vexpress-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/soc
Pull "ARMv7 Vexpress update/cleanup for v4.15" from Sudeep Holla:
Cosmetic cleanup dropping extra debug messages for memory allocation failures
* tag 'vexpress-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
ARM: vexpress/spc: Delete an error message for a failed memory allocation
| -rw-r--r-- | arch/arm/mach-vexpress/spc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c index fe488523694c..21c064267af5 100644 --- a/arch/arm/mach-vexpress/spc.c +++ b/arch/arm/mach-vexpress/spc.c @@ -451,10 +451,8 @@ int __init ve_spc_init(void __iomem *baseaddr, u32 a15_clusid, int irq) { int ret; info = kzalloc(sizeof(*info), GFP_KERNEL); - if (!info) { - pr_err(SPCLOG "unable to allocate mem\n"); + if (!info) return -ENOMEM; - } info->baseaddr = baseaddr; info->a15_clusid = a15_clusid; @@ -535,10 +533,8 @@ static struct clk *ve_spc_clk_register(struct device *cpu_dev) struct clk_spc *spc; spc = kzalloc(sizeof(*spc), GFP_KERNEL); - if (!spc) { - pr_err("could not allocate spc clk\n"); + if (!spc) return ERR_PTR(-ENOMEM); - } spc->hw.init = &init; spc->cluster = topology_physical_package_id(cpu_dev->id); |