leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARMv7 Vexpress update/cleanup for v4.15

Browse Source 
Cosmetic cleanup dropping extra debug messages for memory allocation failures
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJZ23lHAAoJEABBurwxfuKY7+8QAIVsp2oQ3M4IbMxEkgEx3J/I
 6P0TUuFo0f0HN5efAVVZLz/E2crgial5IewUUcIAnQde+GM9PCihZvRzTywzXFC5
 JQlpQa5Wn6OyjbGnSnMiIAmoVvM5u6XTVwSDdwEEn1w8Uqx+CYaAykRTppw2OWCW
 UW9TjJV07TxjsZ4ee/s86xwikvczOImfWBMVEk/iDFLMbLiprEEomPmaD/Pj72q5
 oLWRUFjcPNW6Ea70uBDJbSmrhTwIKkChXWu/ewfd6y/v2+bEQZs6At+o8elISVMD
 DcQGw/L/t4BCLqqncTdDyYrPtFh2R6aXjNyAAmKePK71vwVf/0cbCG7Zd2lno8S9
 SQGHuAC7ntWnLJG3pDlfTFBR91Ecm83hd2HxkOlpC5Bz2jpr9HWIUBIvheaWMaku
 AzvohSOmzSiN0TkVi1tsoTRNFQd7jl6Xq2X1L8y1HVfOBpsv5NDhSUgQtiT3YpmH
 u1h9DjP1NNq76j9a6Fthr+oIowPVOqvS09m8H8GFm6jChO9w9TLbUQ2mBE3G3Wzb
 MzrPZZWCU9JZrOjPhQzPiJ+Msrz5nBOML5qSQZu54q65g4Y5NA89yK5rMIzgMnl8
 fsVb1ulFE5ET/UrdvLuC58aJZ9SP6RwvpBpafKkiLNml20rivxsnsmOur2h/e7j8
 NtmKbiQfaZ80JGc0f1HM
 =FzZS
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2017-10-19 22:36:41 +02:00
commit 877cd7ae0d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-vexpress/spc.c
View File

@ -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);