openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mailbox/omap: use devm_* interfaces 

Use the various devm_ interfaces to simplify the cleanup in
probe and remove functions in OMAP2+ mailbox driver.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Suman Anna 2014-06-24 19:43:37 -05:00 committed by Tony Lindgren
parent cbf14f3ab9
commit 28299a47f4
1 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/mailbox/mailbox-omap2.c
View File

@ -236,23 +236,24 @@ static int omap2_mbox_probe(struct platform_device *pdev)
} }
/* allocate one extra for marking end of list */ /* allocate one extra for marking end of list */
list = kzalloc((pdata->info_cnt + 1) * sizeof(*list), GFP_KERNEL); list = devm_kzalloc(&pdev->dev, (pdata->info_cnt + 1) * sizeof(*list),
GFP_KERNEL);
if (!list) if (!list)
return -ENOMEM; return -ENOMEM;
mboxblk = mbox = kzalloc(pdata->info_cnt * sizeof(*mbox), GFP_KERNEL); mboxblk = devm_kzalloc(&pdev->dev, pdata->info_cnt * sizeof(*mbox),
if (!mboxblk) { GFP_KERNEL);
ret = -ENOMEM; if (!mboxblk)
goto free_list; return -ENOMEM;
}
privblk = priv = kzalloc(pdata->info_cnt * sizeof(*priv), GFP_KERNEL); privblk = devm_kzalloc(&pdev->dev, pdata->info_cnt * sizeof(*priv),
if (!privblk) { GFP_KERNEL);
ret = -ENOMEM; if (!privblk)
goto free_mboxblk; return -ENOMEM;
}
info = pdata->info; info = pdata->info;
mbox = mboxblk;
priv = privblk;
for (i = 0; i < pdata->info_cnt; i++, info++, priv++) { for (i = 0; i < pdata->info_cnt; i++, info++, priv++) {
priv->tx_fifo.msg = MAILBOX_MESSAGE(info->tx_id); priv->tx_fifo.msg = MAILBOX_MESSAGE(info->tx_id);
priv->tx_fifo.fifo_stat = MAILBOX_FIFOSTATUS(info->tx_id); priv->tx_fifo.fifo_stat = MAILBOX_FIFOSTATUS(info->tx_id);
@ -276,55 +277,28 @@ static int omap2_mbox_probe(struct platform_device *pdev)
mbox->name = info->name; mbox->name = info->name;
mbox->ops = &omap2_mbox_ops; mbox->ops = &omap2_mbox_ops;
mbox->irq = platform_get_irq(pdev, info->irq_id); mbox->irq = platform_get_irq(pdev, info->irq_id);
if (mbox->irq < 0) { if (mbox->irq < 0)
ret = mbox->irq; return mbox->irq;
goto free_privblk;
}
list[i] = mbox++; list[i] = mbox++;
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { mbox_base = devm_ioremap_resource(&pdev->dev, mem);
ret = -ENOENT; if (IS_ERR(mbox_base))
goto free_privblk; return PTR_ERR(mbox_base);
}
mbox_base = ioremap(mem->start, resource_size(mem));
if (!mbox_base) {
ret = -ENOMEM;
goto free_privblk;
}
ret = omap_mbox_register(&pdev->dev, list); ret = omap_mbox_register(&pdev->dev, list);
if (ret) if (ret)
goto unmap_mbox; return ret;
platform_set_drvdata(pdev, list); platform_set_drvdata(pdev, list);
return 0; return 0;
unmap_mbox:
iounmap(mbox_base);
free_privblk:
kfree(privblk);
free_mboxblk:
kfree(mboxblk);
free_list:
kfree(list);
return ret;
} }
static int omap2_mbox_remove(struct platform_device *pdev) static int omap2_mbox_remove(struct platform_device *pdev)
{ {
struct omap_mbox2_priv *privblk;
struct omap_mbox **list = platform_get_drvdata(pdev);
struct omap_mbox *mboxblk = list[0];
privblk = mboxblk->priv;
omap_mbox_unregister(); omap_mbox_unregister();
iounmap(mbox_base);
kfree(privblk);
kfree(mboxblk);
kfree(list);
return 0; return 0;
} }