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

Commit 9aedbdba authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

dma: mv_xor: remove hw_id field from platform_data 



There is no need for the platform_data to give this ID, it is simply
the channel number, so we can compute it inside the driver when
registering the channels.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c819ce17

arch/arm/plat-orion/common.c

+0 −4
Original line number Diff line number Diff line
@@ -627,11 +627,9 @@ static struct resource orion_xor0_shared_resources[] = { 


static struct mv_xor_channel_data orion_xor0_channels_data[2] = {

	{

		.hw_id		= 0,

		.pool_size	= PAGE_SIZE,

	},

	{

		.hw_id		= 1,

		.pool_size	= PAGE_SIZE,

	},

};
@@ -702,11 +700,9 @@ static struct resource orion_xor1_shared_resources[] = { 


static struct mv_xor_channel_data orion_xor1_channels_data[2] = {

	{

		.hw_id		= 0,

		.pool_size	= PAGE_SIZE,

	},

	{

		.hw_id		= 1,

		.pool_size	= PAGE_SIZE,

	},

};

drivers/dma/mv_xor.c

+3 −3
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ static int mv_xor_channel_remove(struct mv_xor_chan *mv_chan) 
static struct mv_xor_chan *

mv_xor_channel_add(struct mv_xor_device *xordev,

		   struct platform_device *pdev,

		   int hw_id, dma_cap_mask_t cap_mask,

		   int idx, dma_cap_mask_t cap_mask,

		   size_t pool_size, int irq)

{

	int ret = 0;
@@ -1101,7 +1101,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev, 
		goto err_free_dma;

	}



	mv_chan->idx = hw_id;

	mv_chan->idx = idx;



	dma_dev = &mv_chan->dmadev;
@@ -1295,7 +1295,7 @@ static int mv_xor_probe(struct platform_device *pdev) 
			}



			xordev->channels[i] =

				mv_xor_channel_add(xordev, pdev, cd->hw_id,

				mv_xor_channel_add(xordev, pdev, i,

						   cd->cap_mask,

						   cd->pool_size, irq);

			if (IS_ERR(xordev->channels[i])) {

include/linux/platform_data/dma-mv_xor.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#define MV_XOR_NAME	"mv_xor"



struct mv_xor_channel_data {

	int				hw_id;

	dma_cap_mask_t			cap_mask;

	size_t				pool_size;

};