From: Venkatraman S venkat@linaro.org
The underlying implementation in enable_fiq/disable_fiq uses the irqs anyway, so use them directly.
Signed-off-by: Venkatraman S venkat@linaro.org --- arch/arm/mach-rpc/dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index 85883b2..83bb9ac 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c @@ -289,13 +289,13 @@ static void floppy_enable_dma(unsigned int chan, dma_t *dma)
set_fiq_handler(fiqhandler_start, fiqhandler_length); set_fiq_regs(®s); - enable_fiq(fdma->fiq); + enable_irq(fdma->fiq + FIQ_START); }
static void floppy_disable_dma(unsigned int chan, dma_t *dma) { struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma); - disable_fiq(fdma->fiq); + disable_irq(fdma->fiq + FIQ_START); release_fiq(&fh); }
On Tue, 23 Aug 2011, Venkatraman S wrote:
From: Venkatraman S venkat@linaro.org
The underlying implementation in enable_fiq/disable_fiq uses the irqs anyway, so use them directly.
Signed-off-by: Venkatraman S venkat@linaro.org
Maybe folding the FIQ_START constant into the actual fiq number would be better here. Looking at arch/arm/mach-rpc/include/mach/irqs.h we have:
#define FIQ_FLOPPYDATA 0 #define FIQ_ECONET 2 #define FIQ_SERIALPORT 4 #define FIQ_EXPANSIONCARD 6 #define FIQ_FORCE 7
/* * This is the offset of the FIQ "IRQ" numbers */ #define FIQ_START 64
So instead this could be moved around so that you would have:
#define FIQ_FLOPPYDATA (FIQ_START + 0) #define FIQ_ECONET (FIQ_START + 2) #define FIQ_SERIALPORT (FIQ_START + 4) #define FIQ_EXPANSIONCARD (FIQ_START + 6) #define FIQ_FORCE (FIQ_START + 7)
None of them, except for FIQ_FLOPPYDATA, are used in the whole tree anyway.
With that cleanup this is one patch you could already post on LAK for possible inclusion right away.
Nicolas
-
Nicolas Pitre -
Venkatraman S