Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1baec52 authored by Shawn Guo's avatar Shawn Guo Committed by Vinod Koul
Browse files

dma: mxs-dma: remove code left from generic DMA binding conversion 



With all mxs-dma clients moved to use generic DMA helper, the code
left from generic DMA binding conversion can be removed now.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent e8690fc2

drivers/dma/mxs-dma.c

+0 −23
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/dmaengine.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/fsl/mxs-dma.h>

#include <linux/stmp_device.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -197,24 +196,6 @@ static struct mxs_dma_chan *to_mxs_dma_chan(struct dma_chan *chan) 
	return container_of(chan, struct mxs_dma_chan, chan);

}



int mxs_dma_is_apbh(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;



	return dma_is_apbh(mxs_dma);

}

EXPORT_SYMBOL_GPL(mxs_dma_is_apbh);



int mxs_dma_is_apbx(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;



	return !dma_is_apbh(mxs_dma);

}

EXPORT_SYMBOL_GPL(mxs_dma_is_apbx);



static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)

{

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
@@ -349,13 +330,9 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id) 
static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)

{

	struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);

	struct mxs_dma_data *data = chan->private;

	struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;

	int ret;



	if (data)

		mxs_chan->chan_irq = data->chan_irq;



	mxs_chan->ccw = dma_alloc_coherent(mxs_dma->dma_device.dev,

				CCW_BLOCK_SIZE, &mxs_chan->ccw_phys,

				GFP_KERNEL);

include/linux/fsl/mxs-dma.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __MACH_MXS_DMA_H__

#define __MACH_MXS_DMA_H__



#include <linux/dmaengine.h>



struct mxs_dma_data {

	int chan_irq;

};



extern int mxs_dma_is_apbh(struct dma_chan *chan);

extern int mxs_dma_is_apbx(struct dma_chan *chan);

#endif /* __MACH_MXS_DMA_H__ */