[PATCH] 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 in this case, 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: Christian Dietrich

drivers/ide/icside.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

I attach the configuration, that exposes this compilation error.

This patch was
*NOT* tested on real hardware. I don't if the fix really does solve the
problem, but at least it is a hint that there is a problem.

diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 8716066..62c59c1 100644
a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -271,7 +271,7 @@ static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)

ide_set_drivedata(drive, (void *)cycle_time);

- printk("%s: %s selected (peak %dMB/s)", drive->name,
+ printk("%s: %s selected (peak %ldMB/s)", drive->name,

ide_xfer_verbose(xfer_mode),
2000 / (unsigned long)ide_get_drivedata(drive));
}
@@ -456,7 +456,9 @@ err_free:
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,
+#ifdef CONFIG_BLK_DEV_IDEDMA_ICS

.dma_ops =&icside_v6_dma_ops,
+#endif
.host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,
.mwdma_mask = ATA_MWDMA2,
.swdma_mask = ATA_SWDMA2,
@@ -518,10 +520,12 @@ 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
+#endif
d.dma_ops = NULL;

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

Peak datarate is never bigger than an integer, and can therefore, as
suggested in the printk format string, casted to an integer.

drivers/ide/icside.c | 6 +++
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 83e5100..755ef6b 100644
a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -271,9 +271,9 @@ static void icside_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)

ide_set_drivedata(drive, (void *)cycle_time);

- printk("%s: %s selected (peak %dMB/s)", drive->name,
- ide_xfer_verbose(xfer_mode),
- 2000 / (unsigned long)ide_get_drivedata(drive));
+ printk(KERN_INFO "%s: %s selected (peak %dMB/s)", drive->name,
+ ide_xfer_verbose(xfer_mode),
+ (int) (2000 / (unsigned long)ide_get_drivedata(drive)));