From patchwork Tue May 29 10:30:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Dietrich X-Patchwork-Id: 161731 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1AB8DB6FBB for ; Tue, 29 May 2012 20:40:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367Ab2E2KkK (ORCPT ); Tue, 29 May 2012 06:40:10 -0400 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:47433 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753295Ab2E2KkK (ORCPT ); Tue, 29 May 2012 06:40:10 -0400 X-Greylist: delayed 604 seconds by postgrey-1.27 at vger.kernel.org; Tue, 29 May 2012 06:40:10 EDT Received: from faui49q (faui49q.informatik.uni-erlangen.de [131.188.42.68]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id D115458C4AE; Tue, 29 May 2012 12:30:02 +0200 (CEST) Received: by faui49q (sSMTP sendmail emulation); Tue, 29 May 2012 12:30:02 +0200 Date: Tue, 29 May 2012 12:30:02 +0200 From: Christian Dietrich To: "David S. Miller" Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, vamos-dev@lists.cs.fau.de Subject: [PATCH] ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n Message-ID: <20120529103002.GA13283@faui49q.informatik.uni-erlangen.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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)\n", drive->name, + printk("%s: %s selected (peak %ldMB/s)\n", 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);