[PATCH 3/4] axonram: Return directly after a failed kzalloc() in axon_ram_probe()

SF Markus Elfring
2017-08-03T19:15:49Z

Date: Thu, 3 Aug 2017 20:23:57 +0200

* Return directly after a call of the function "kzalloc" failed
at the beginning.

* Delete a repeated check for the local variable "bank"
which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/powerpc/sysdev/axonram.c | 39 +++++++++++++++++----------------------
1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index bf1506ec2ca4..93cc902350db 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -192,10 +192,8 @@ static int axon_ram_probe(struct platform_device *device)
device->dev.of_node->full_name);

bank = kzalloc(sizeof(*bank), GFP_KERNEL);
- if (bank = NULL) {
- rc = -ENOMEM;
- goto failed;
- }
+ if (!bank)
+ return -ENOMEM;

device->dev.platform_data = bank;

@@ -291,25 +289,22 @@ static int axon_ram_probe(struct platform_device *device)
return 0;

failed:
- if (bank != NULL) {
- if (bank->irq_id)
- free_irq(bank->irq_id, device);
- if (bank->disk != NULL) {
- if (bank->disk->major > 0)
- unregister_blkdev(bank->disk->major,
- bank->disk->disk_name);
- if (bank->disk->flags & GENHD_FL_UP)
- del_gendisk(bank->disk);
- put_disk(bank->disk);
- }
- kill_dax(bank->dax_dev);
- put_dax(bank->dax_dev);
- device->dev.platform_data = NULL;
- if (bank->io_addr != 0)
- iounmap((void __iomem *) bank->io_addr);
- kfree(bank);
+ if (bank->irq_id)
+ free_irq(bank->irq_id, device);
+ if (bank->disk != NULL) {
+ if (bank->disk->major > 0)
+ unregister_blkdev(bank->disk->major,
+ bank->disk->disk_name);
+ if (bank->disk->flags & GENHD_FL_UP)
+ del_gendisk(bank->disk);
+ put_disk(bank->disk);
}
-
+ kill_dax(bank->dax_dev);
+ put_dax(bank->dax_dev);
+ device->dev.platform_data = NULL;
+ if (bank->io_addr != 0)
+ iounmap((void __iomem *) bank->io_addr);
+ kfree(bank);
return rc;
}

--
2.13.4