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

Commit 7e5212af authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

ata: ep93xx: Use proper enums for directions 



[ Upstream commit 6adde4a36f1b6a562a1057fbb1065007851050e7 ]

Clang warns when one enumerated type is implicitly converted to another.

drivers/ata/pata_ep93xx.c:662:36: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
        drv_data->dma_rx_data.direction = DMA_FROM_DEVICE;
                                        ~ ^~~~~~~~~~~~~~~
drivers/ata/pata_ep93xx.c:670:36: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
        drv_data->dma_tx_data.direction = DMA_TO_DEVICE;
                                        ~ ^~~~~~~~~~~~~
drivers/ata/pata_ep93xx.c:681:19: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
        conf.direction = DMA_FROM_DEVICE;
                       ~ ^~~~~~~~~~~~~~~
drivers/ata/pata_ep93xx.c:692:19: warning: implicit conversion from
enumeration type 'enum dma_data_direction' to different enumeration type
'enum dma_transfer_direction' [-Wenum-conversion]
        conf.direction = DMA_TO_DEVICE;
                       ~ ^~~~~~~~~~~~~

Use the equivalent valued enums from the expected type so that Clang no
longer warns about a conversion.

DMA_TO_DEVICE = DMA_MEM_TO_DEV = 1
DMA_FROM_DEVICE = DMA_DEV_TO_MEM = 2

Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aa343014

drivers/ata/pata_ep93xx.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -659,7 +659,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) 
	 * start of new transfer.

	 * start of new transfer.

	 */

	 */

	drv_data->dma_rx_data.port = EP93XX_DMA_IDE;

	drv_data->dma_rx_data.port = EP93XX_DMA_IDE;

	drv_data->dma_rx_data.direction = DMA_FROM_DEVICE;

	drv_data->dma_rx_data.direction = DMA_DEV_TO_MEM;

	drv_data->dma_rx_data.name = "ep93xx-pata-rx";

	drv_data->dma_rx_data.name = "ep93xx-pata-rx";

	drv_data->dma_rx_channel = dma_request_channel(mask,

	drv_data->dma_rx_channel = dma_request_channel(mask,

		ep93xx_pata_dma_filter, &drv_data->dma_rx_data);

		ep93xx_pata_dma_filter, &drv_data->dma_rx_data);
@@ -667,7 +667,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) 
		return;

		return;





	drv_data->dma_tx_data.port = EP93XX_DMA_IDE;

	drv_data->dma_tx_data.port = EP93XX_DMA_IDE;

	drv_data->dma_tx_data.direction = DMA_TO_DEVICE;

	drv_data->dma_tx_data.direction = DMA_MEM_TO_DEV;

	drv_data->dma_tx_data.name = "ep93xx-pata-tx";

	drv_data->dma_tx_data.name = "ep93xx-pata-tx";

	drv_data->dma_tx_channel = dma_request_channel(mask,

	drv_data->dma_tx_channel = dma_request_channel(mask,

		ep93xx_pata_dma_filter, &drv_data->dma_tx_data);

		ep93xx_pata_dma_filter, &drv_data->dma_tx_data);
@@ -678,7 +678,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) 




	/* Configure receive channel direction and source address */

	/* Configure receive channel direction and source address */

	memset(&conf, 0, sizeof(conf));

	memset(&conf, 0, sizeof(conf));

	conf.direction = DMA_FROM_DEVICE;

	conf.direction = DMA_DEV_TO_MEM;

	conf.src_addr = drv_data->udma_in_phys;

	conf.src_addr = drv_data->udma_in_phys;

	conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	if (dmaengine_slave_config(drv_data->dma_rx_channel, &conf)) {

	if (dmaengine_slave_config(drv_data->dma_rx_channel, &conf)) {
@@ -689,7 +689,7 @@ static void ep93xx_pata_dma_init(struct ep93xx_pata_data *drv_data) 




	/* Configure transmit channel direction and destination address */

	/* Configure transmit channel direction and destination address */

	memset(&conf, 0, sizeof(conf));

	memset(&conf, 0, sizeof(conf));

	conf.direction = DMA_TO_DEVICE;

	conf.direction = DMA_MEM_TO_DEV;

	conf.dst_addr = drv_data->udma_out_phys;

	conf.dst_addr = drv_data->udma_out_phys;

	conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	if (dmaengine_slave_config(drv_data->dma_tx_channel, &conf)) {

	if (dmaengine_slave_config(drv_data->dma_tx_channel, &conf)) {