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

Commit 32a527ad authored by Christian Dietrich's avatar Christian Dietrich Committed by David S. Miller
Browse files

ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n 



The icside driver can be configured without DMA support, but it
doesn't compile then, because DMA operations are referenced.

drivers/ide/icside.c:523: error: 'icside_v6_port_ops' undeclared
drivers/ide/icside.c:522: error: 'icside_dma_init' undeclared

Signed-off-by: default avatarChristian <Dietrich&lt;christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eea5b551

drivers/ide/icside.c

+4 −5
Original line number Diff line number Diff line
@@ -375,8 +375,6 @@ static const struct ide_dma_ops icside_v6_dma_ops = { 
	.dma_test_irq		= icside_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

};

#else

#define icside_v6_dma_ops NULL

#endif



static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
@@ -456,7 +454,6 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec) 
static const struct ide_port_info icside_v6_port_info __initdata = {

	.init_dma		= icside_dma_off_init,

	.port_ops		= &icside_v6_no_dma_port_ops,

	.dma_ops		= &icside_v6_dma_ops,

	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,

	.mwdma_mask		= ATA_MWDMA2,

	.swdma_mask		= ATA_SWDMA2,
@@ -518,11 +515,13 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 


	ecard_set_drvdata(ec, state);



#ifdef CONFIG_BLK_DEV_IDEDMA_ICS

	if (ec->dma != NO_DMA && !request_dma(ec->dma, DRV_NAME)) {

		d.init_dma = icside_dma_init;

		d.port_ops = &icside_v6_port_ops;

	} else

		d.dma_ops = NULL;

		d.dma_ops  = &icside_v6_dma_ops;

	}

#endif



	ret = ide_host_register(host, &d, hws);

	if (ret)