hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
kernel/drivers/firmware/stratix10-svc.c
....@@ -622,8 +622,8 @@
622622 end = rounddown(sh_memory->addr + sh_memory->size, PAGE_SIZE);
623623 paddr = begin;
624624 size = end - begin;
625
- va = memremap(paddr, size, MEMREMAP_WC);
626
- if (!va) {
625
+ va = devm_memremap(dev, paddr, size, MEMREMAP_WC);
626
+ if (IS_ERR(va)) {
627627 dev_err(dev, "fail to remap shared memory\n");
628628 return ERR_PTR(-EINVAL);
629629 }
....@@ -989,8 +989,8 @@
989989 return ret;
990990
991991 genpool = svc_create_memory_pool(pdev, sh_memory);
992
- if (!genpool)
993
- return -ENOMEM;
992
+ if (IS_ERR(genpool))
993
+ return PTR_ERR(genpool);
994994
995995 /* allocate service controller and supporting channel */
996996 controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL);