diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2009-10-13 14:22:34 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:52:54 -0500 |
commit | ea071cc705e8bfba0c8bf84be8d4f9f4e9da6962 (patch) | |
tree | 9dafff9da1740dcfc475100b4d5dae963650cfd1 /drivers/ide | |
parent | f1fc6645a4d2cb944320ce8ed1e40f88059779e1 (diff) |
MIPS: Alchemy: remove dbdma compat macros
Remove dbdma compat macros, move remaining users over to default
queueing functions and -flags.
(Queueing function signature has changed in order to give
a build failure instead of silent functional changes due
to the no longer implicitly specified DDMA_FLAGS_IE flag)
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/au1xxx-ide.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c index 87cef0c440ad..377412e1d32b 100644 --- a/drivers/ide/au1xxx-ide.c +++ b/drivers/ide/au1xxx-ide.c | |||
@@ -56,8 +56,8 @@ static inline void auide_insw(unsigned long port, void *addr, u32 count) | |||
56 | chan_tab_t *ctp; | 56 | chan_tab_t *ctp; |
57 | au1x_ddma_desc_t *dp; | 57 | au1x_ddma_desc_t *dp; |
58 | 58 | ||
59 | if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, | 59 | if (!au1xxx_dbdma_put_dest(ahwif->rx_chan, (void*)addr, |
60 | DDMA_FLAGS_NOIE)) { | 60 | count << 1, DDMA_FLAGS_NOIE)) { |
61 | printk(KERN_ERR "%s failed %d\n", __func__, __LINE__); | 61 | printk(KERN_ERR "%s failed %d\n", __func__, __LINE__); |
62 | return; | 62 | return; |
63 | } | 63 | } |
@@ -74,8 +74,8 @@ static inline void auide_outsw(unsigned long port, void *addr, u32 count) | |||
74 | chan_tab_t *ctp; | 74 | chan_tab_t *ctp; |
75 | au1x_ddma_desc_t *dp; | 75 | au1x_ddma_desc_t *dp; |
76 | 76 | ||
77 | if(!put_source_flags(ahwif->tx_chan, (void*)addr, | 77 | if (!au1xxx_dbdma_put_source(ahwif->tx_chan, (void*)addr, |
78 | count << 1, DDMA_FLAGS_NOIE)) { | 78 | count << 1, DDMA_FLAGS_NOIE)) { |
79 | printk(KERN_ERR "%s failed %d\n", __func__, __LINE__); | 79 | printk(KERN_ERR "%s failed %d\n", __func__, __LINE__); |
80 | return; | 80 | return; |
81 | } | 81 | } |
@@ -246,17 +246,14 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd) | |||
246 | flags = DDMA_FLAGS_NOIE; | 246 | flags = DDMA_FLAGS_NOIE; |
247 | 247 | ||
248 | if (iswrite) { | 248 | if (iswrite) { |
249 | if(!put_source_flags(ahwif->tx_chan, | 249 | if (!au1xxx_dbdma_put_source(ahwif->tx_chan, |
250 | (void*) sg_virt(sg), | 250 | (void *)sg_virt(sg), tc, flags)) { |
251 | tc, flags)) { | ||
252 | printk(KERN_ERR "%s failed %d\n", | 251 | printk(KERN_ERR "%s failed %d\n", |
253 | __func__, __LINE__); | 252 | __func__, __LINE__); |
254 | } | 253 | } |
255 | } else | 254 | } else { |
256 | { | 255 | if (!au1xxx_dbdma_put_dest(ahwif->rx_chan, |
257 | if(!put_dest_flags(ahwif->rx_chan, | 256 | (void *)sg_virt(sg), tc, flags)) { |
258 | (void*) sg_virt(sg), | ||
259 | tc, flags)) { | ||
260 | printk(KERN_ERR "%s failed %d\n", | 257 | printk(KERN_ERR "%s failed %d\n", |
261 | __func__, __LINE__); | 258 | __func__, __LINE__); |
262 | } | 259 | } |