Skip to content

Commit

Permalink
sata_dwc_460ex: convert to devm_kzalloc in ->probe()
Browse files Browse the repository at this point in the history
The patch converts ->probe() to use devm_kzalloc that simplifies error path.
Note that ata_host_alloc_pinfo() has been using device resources already.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Andy Shevchenko authored and Tejun Heo committed Jan 8, 2015
1 parent c592b74 commit d537fc0
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions drivers/ata/sata_dwc_460ex.c
Original file line number Diff line number Diff line change
Expand Up @@ -1676,10 +1676,13 @@ static int sata_dwc_probe(struct platform_device *ofdev)
u32 dma_chan;

/* Allocate DWC SATA device */
hsdev = kzalloc(sizeof(*hsdev), GFP_KERNEL);
if (hsdev == NULL)
host = ata_host_alloc_pinfo(&ofdev->dev, ppi, SATA_DWC_MAX_PORTS);
hsdev = devm_kzalloc(&ofdev->dev, sizeof(*hsdev), GFP_KERNEL);
if (!host || !hsdev)
return -ENOMEM;

host->private_data = hsdev;

if (of_property_read_u32(np, "dma-channel", &dma_chan)) {
dev_warn(&ofdev->dev, "no dma-channel property set."
" Use channel 0\n");
Expand All @@ -1692,25 +1695,14 @@ static int sata_dwc_probe(struct platform_device *ofdev)
if (!base) {
dev_err(&ofdev->dev, "ioremap failed for SATA register"
" address\n");
err = -ENODEV;
goto error_kmalloc;
return -ENODEV;
}
hsdev->reg_base = base;
dev_dbg(&ofdev->dev, "ioremap done for SATA register address\n");

/* Synopsys DWC SATA specific Registers */
hsdev->sata_dwc_regs = (void *__iomem)(base + SATA_DWC_REG_OFFSET);

/* Allocate and fill host */
host = ata_host_alloc_pinfo(&ofdev->dev, ppi, SATA_DWC_MAX_PORTS);
if (!host) {
dev_err(&ofdev->dev, "ata_host_alloc_pinfo failed\n");
err = -ENOMEM;
goto error_iomap;
}

host->private_data = hsdev;

/* Setup port */
host->ports[0]->ioaddr.cmd_addr = base;
host->ports[0]->ioaddr.scr_addr = base + SATA_DWC_SCR_OFFSET;
Expand Down Expand Up @@ -1778,8 +1770,6 @@ static int sata_dwc_probe(struct platform_device *ofdev)
iounmap((void __iomem *)host_pvt.sata_dma_regs);
error_iomap:
iounmap(base);
error_kmalloc:
kfree(hsdev);
return err;
}

Expand All @@ -1796,8 +1786,6 @@ static int sata_dwc_remove(struct platform_device *ofdev)

iounmap((void __iomem *)host_pvt.sata_dma_regs);
iounmap(hsdev->reg_base);
kfree(hsdev);
kfree(host);
dev_dbg(&ofdev->dev, "done\n");
return 0;
}
Expand Down

0 comments on commit d537fc0

Please sign in to comment.