On Thu, 2014-01-02 at 15:12 +0000, Russell King wrote:
> This really needs to be there, because otherwise the plat-omap code can
> kfree() this data structure, and then re-use the pointer later.
One comment bellow.
>
> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
> ---
> arch/arm/mach-omap1/dma.c | 11 -----------
> arch/arm/mach-omap2/dma.c | 7 -------
> arch/arm/plat-omap/dma.c | 11 ++++++++---
> include/linux/omap-dma.h | 1 -
> 4 files changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
> index 4aae75d40bdd..3e93d0a323a4 100644
> --- a/arch/arm/mach-omap1/dma.c
> +++ b/arch/arm/mach-omap1/dma.c
> @@ -325,17 +325,6 @@ static int __init omap1_system_dma_init(void)
> d->dev_caps |= CLEAR_CSR_ON_READ;
> d->dev_caps |= IS_WORD_16;
>
> -
> - d->chan = kzalloc(sizeof(struct omap_dma_lch) *
> - (d->lch_count), GFP_KERNEL);
> - if (!d->chan) {
> - dev_err(&pdev->dev,
> - "%s: Memory allocation failed for d->chan!\n",
> - __func__);
> - ret = -ENOMEM;
> - goto exit_release_d;
> - }
> -
> if (cpu_is_omap15xx())
> d->chan_count = 9;
> else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {
> diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
> index 244ff5012aed..9f210d637354 100644
> --- a/arch/arm/mach-omap2/dma.c
> +++ b/arch/arm/mach-omap2/dma.c
> @@ -251,13 +251,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
> }
>
> d = oh->dev_attr;
> - d->chan = kzalloc(sizeof(struct omap_dma_lch) *
> - (d->lch_count), GFP_KERNEL);
> -
> - if (!d->chan) {
> - dev_err(&pdev->dev, "%s: kzalloc fail\n", __func__);
> - return -ENOMEM;
> - }
>
> if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP))
> d->dev_caps |= HS_CHANNELS_RESERVED;
> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> index d4d9a5e62152..377c3d7dc4ce 100644
> --- a/arch/arm/plat-omap/dma.c
> +++ b/arch/arm/plat-omap/dma.c
> @@ -2030,9 +2030,16 @@ static int omap_system_dma_probe(struct platform_device *pdev)
>
> dma_lch_count = d->lch_count;
> dma_chan_count = dma_lch_count;
> - dma_chan = d->chan;
> enable_1510_mode = d->dev_caps & ENABLE_1510_MODE;
>
> + dma_chan = devm_kzalloc(&pdev->dev, sizeof(struct omap_dma_lch) *
> + dma_lch_count, GFP_KERNEL);
devm_kcalloc ?
> + if (!dma_chan) {
> + dev_err(&pdev->dev, "%s: kzalloc fail\n", __func__);
> + return -ENOMEM;
> + }
> +
> +
> if (dma_omap2plus()) {
> dma_linked_lch = kzalloc(sizeof(struct dma_link_info) *
> dma_lch_count, GFP_KERNEL);
> @@ -2117,7 +2124,6 @@ static int omap_system_dma_probe(struct platform_device *pdev)
> }
>
> exit_dma_lch_fail:
> - kfree(dma_chan);
> return ret;
> }
>
> @@ -2137,7 +2143,6 @@ static int omap_system_dma_remove(struct platform_device *pdev)
> free_irq(dma_irq, (void *)(irq_rel + 1));
> }
> }
> - kfree(dma_chan);
> return 0;
> }
>
> diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h
> index 41328725721a..7813636a193d 100644
> --- a/include/linux/omap-dma.h
> +++ b/include/linux/omap-dma.h
> @@ -268,7 +268,6 @@ struct omap_dma_dev_attr {
> u32 dev_caps;
> u16 lch_count;
> u16 chan_count;
> - struct omap_dma_lch *chan;
> };
>
> enum {
--
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
