From: Daniel Mack <daniel@caiaq.de>
To: linux-mips@linux-mips.org
Subject: [PATCH] IDE/DMA for au1xxx
Date: Thu, 15 Mar 2007 13:20:12 +0100 [thread overview]
Message-ID: <20070315122012.GA8612@ipxXXXXX> (raw)
[-- Attachment #1: Type: text/plain, Size: 117 bytes --]
Hi,
this makes the DMA part of Au1xxx's IDE interface compile again.
Signed-of-by: Daniel Mack <daniel@caiaq.de>
[-- Attachment #2: au1xxx-ide-dma.patch --]
[-- Type: text/plain, Size: 2116 bytes --]
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index b2dc028..806b6d1 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -443,7 +443,6 @@ static void auide_dma_host_on(ide_drive_t *drive)
static int auide_dma_on(ide_drive_t *drive)
{
drive->using_dma = 1;
-
return 0;
}
@@ -638,6 +637,7 @@ static int au_ide_probe(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
_auide_hwif *ahwif = &auide_hwif;
ide_hwif_t *hwif;
+ hw_regs_t *hw;
struct resource *res;
int ret = 0;
@@ -681,7 +681,7 @@ static int au_ide_probe(struct device *dev)
/* FIXME: This might possibly break PCMCIA IDE devices */
hwif = &ide_hwifs[pdev->id];
- hw_regs_t *hw = &hwif->hw;
+ hw = &hwif->hw;
hwif->irq = hw->irq = ahwif->irq;
hwif->chipset = ide_au1xxx;
diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/include/asm-mips/mach-au1x00/au1xxx_ide.h
index e9fa252..e747814 100644
--- a/include/asm-mips/mach-au1x00/au1xxx_ide.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h
@@ -166,13 +166,13 @@ int __init auide_probe(void);
static int auide_dma_setup(ide_drive_t *drive);
static int auide_dma_check(ide_drive_t *drive);
static int auide_dma_test_irq(ide_drive_t *drive);
- static int auide_dma_host_off(ide_drive_t *drive);
- static int auide_dma_host_on(ide_drive_t *drive);
+ static void auide_dma_host_off(ide_drive_t *drive);
+ static void auide_dma_host_on(ide_drive_t *drive);
static int auide_dma_lostirq(ide_drive_t *drive);
static int auide_dma_on(ide_drive_t *drive);
static void auide_ddma_tx_callback(int irq, void *param);
static void auide_ddma_rx_callback(int irq, void *param);
- static int auide_dma_off_quietly(ide_drive_t *drive);
+ static void auide_dma_off_quietly(ide_drive_t *drive);
#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */
/*******************************************************************************
next reply other threads:[~2007-03-15 12:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-15 12:20 Daniel Mack [this message]
2007-03-15 14:02 ` [PATCH] IDE/DMA for au1xxx Sergei Shtylyov
2007-03-15 14:39 ` Daniel Mack
2007-03-15 20:07 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070315122012.GA8612@ipxXXXXX \
--to=daniel@caiaq.de \
--cc=linux-mips@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.