| .. | .. |
|---|
| 622 | 622 | end = rounddown(sh_memory->addr + sh_memory->size, PAGE_SIZE); |
|---|
| 623 | 623 | paddr = begin; |
|---|
| 624 | 624 | 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)) { |
|---|
| 627 | 627 | dev_err(dev, "fail to remap shared memory\n"); |
|---|
| 628 | 628 | return ERR_PTR(-EINVAL); |
|---|
| 629 | 629 | } |
|---|
| .. | .. |
|---|
| 989 | 989 | return ret; |
|---|
| 990 | 990 | |
|---|
| 991 | 991 | genpool = svc_create_memory_pool(pdev, sh_memory); |
|---|
| 992 | | - if (!genpool) |
|---|
| 993 | | - return -ENOMEM; |
|---|
| 992 | + if (IS_ERR(genpool)) |
|---|
| 993 | + return PTR_ERR(genpool); |
|---|
| 994 | 994 | |
|---|
| 995 | 995 | /* allocate service controller and supporting channel */ |
|---|
| 996 | 996 | controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); |
|---|