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

Commit 9308add6 authored by Dan Williams's avatar Dan Williams
Browse files

dmaengine: cleanup unused transaction types 



No drivers currently implement these operation types, so they can be
deleted.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 138f4c35

arch/arm/mach-iop13xx/setup.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -477,10 +477,8 @@ void __init iop13xx_platform_init(void) 
			plat_data = &iop13xx_adma_0_data;

			plat_data = &iop13xx_adma_0_data;

			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_DUAL_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_MEMCPY_CRC32C, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			break;

			break;

		case IOP13XX_INIT_ADMA_1:

		case IOP13XX_INIT_ADMA_1:
@@ -489,10 +487,8 @@ void __init iop13xx_platform_init(void) 
			plat_data = &iop13xx_adma_1_data;

			plat_data = &iop13xx_adma_1_data;

			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_DUAL_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_MEMCPY_CRC32C, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			break;

			break;

		case IOP13XX_INIT_ADMA_2:

		case IOP13XX_INIT_ADMA_2:
@@ -501,13 +497,10 @@ void __init iop13xx_platform_init(void) 
			plat_data = &iop13xx_adma_2_data;

			plat_data = &iop13xx_adma_2_data;

			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_MEMCPY, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_DUAL_XOR, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_XOR_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_MEMSET, plat_data->cap_mask);

			dma_cap_set(DMA_MEMCPY_CRC32C, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			dma_cap_set(DMA_INTERRUPT, plat_data->cap_mask);

			dma_cap_set(DMA_PQ, plat_data->cap_mask);

			dma_cap_set(DMA_PQ, plat_data->cap_mask);

			dma_cap_set(DMA_PQ_UPDATE, plat_data->cap_mask);

			dma_cap_set(DMA_PQ_VAL, plat_data->cap_mask);

			dma_cap_set(DMA_PQ_VAL, plat_data->cap_mask);

			break;

			break;

		}

		}

arch/arm/plat-iop/adma.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -179,7 +179,6 @@ static int __init iop3xx_adma_cap_init(void) 
	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_0_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_0_data.cap_mask);

	#else

	#else

	dma_cap_set(DMA_MEMCPY, iop3xx_dma_0_data.cap_mask);

	dma_cap_set(DMA_MEMCPY, iop3xx_dma_0_data.cap_mask);

	dma_cap_set(DMA_MEMCPY_CRC32C, iop3xx_dma_0_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_0_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_0_data.cap_mask);

	#endif

	#endif
@@ -188,7 +187,6 @@ static int __init iop3xx_adma_cap_init(void) 
	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_1_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_1_data.cap_mask);

	#else

	#else

	dma_cap_set(DMA_MEMCPY, iop3xx_dma_1_data.cap_mask);

	dma_cap_set(DMA_MEMCPY, iop3xx_dma_1_data.cap_mask);

	dma_cap_set(DMA_MEMCPY_CRC32C, iop3xx_dma_1_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_1_data.cap_mask);

	dma_cap_set(DMA_INTERRUPT, iop3xx_dma_1_data.cap_mask);

	#endif

	#endif

drivers/dma/iop-adma.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1256,15 +1256,12 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) 
	}

	}





	dev_printk(KERN_INFO, &pdev->dev, "Intel(R) IOP: "

	dev_printk(KERN_INFO, &pdev->dev, "Intel(R) IOP: "

	  "( %s%s%s%s%s%s%s%s%s%s)\n",

	  "( %s%s%s%s%s%s%s)\n",

	  dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",

	  dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",

	  dma_has_cap(DMA_PQ_UPDATE, dma_dev->cap_mask) ? "pq_update " : "",

	  dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",

	  dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",

	  dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",

	  dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",

	  dma_has_cap(DMA_DUAL_XOR, dma_dev->cap_mask) ? "dual_xor " : "",

	  dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",

	  dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",

	  dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",

	  dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",

	  dma_has_cap(DMA_MEMCPY_CRC32C, dma_dev->cap_mask) ? "cpy+crc " : "",

	  dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",

	  dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",

	  dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");

	  dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");

include/linux/dmaengine.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -56,12 +56,9 @@ enum dma_transaction_type { 
	DMA_MEMCPY,

	DMA_MEMCPY,

	DMA_XOR,

	DMA_XOR,

	DMA_PQ,

	DMA_PQ,

	DMA_DUAL_XOR,

	DMA_PQ_UPDATE,

	DMA_XOR_VAL,

	DMA_XOR_VAL,

	DMA_PQ_VAL,

	DMA_PQ_VAL,

	DMA_MEMSET,

	DMA_MEMSET,

	DMA_MEMCPY_CRC32C,

	DMA_INTERRUPT,

	DMA_INTERRUPT,

	DMA_PRIVATE,

	DMA_PRIVATE,

	DMA_ASYNC_TX,

	DMA_ASYNC_TX,