Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / axonram.c

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 1e15deacccafc73ad94d04472c9d3bcdc20127b6..c60e84e4558d995bedddce41ee20340dbc737a78 100644 (file)
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -188,15 +188,12 @@ static int axon_ram_probe(struct platform_device *device)
 
        axon_ram_bank_id++;
 
-       dev_info(&device->dev, "Found memory controller on %s\n",
-                       device->dev.of_node->full_name);
+       dev_info(&device->dev, "Found memory controller on %pOF\n",
+                       device->dev.of_node);
 
-       bank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL);
-       if (bank == NULL) {
-               dev_err(&device->dev, "Out of memory\n");
-               rc = -ENOMEM;
-               goto failed;
-       }
+       bank = kzalloc(sizeof(*bank), GFP_KERNEL);
+       if (!bank)
+               return -ENOMEM;
 
        device->dev.platform_data = bank;
 
@@ -292,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;
 }