lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include/asm-x86/floppy.h: checkpatch cleanups - formatting only

Browse Source 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Joe Perches
2008-03-23 01:02:11 -07:00
committed by Ingo Molnar
parent dca13fb0fc
commit 4637bc07c8
1 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/asm-x86/floppy.h
View File

@@ -21,7 +21,8 @@
* floppy accesses go through the track buffer. * floppy accesses go through the track buffer.
*/ */
#define _CROSS_64KB(a, s, vdma) \ #define _CROSS_64KB(a, s, vdma) \
(!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) (!(vdma) && \
((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64))
#define CROSS_64KB(a, s) _CROSS_64KB(a, s, use_virtual_dma & 1) #define CROSS_64KB(a, s) _CROSS_64KB(a, s, use_virtual_dma & 1)
@@ -57,9 +58,9 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id)
#undef TRACE_FLPY_INT #undef TRACE_FLPY_INT
#ifdef TRACE_FLPY_INT #ifdef TRACE_FLPY_INT
static int calls=0; static int calls;
static int bytes=0; static int bytes;
static int dma_wait=0; static int dma_wait;
#endif #endif
if (!doing_pdma) if (!doing_pdma)
return floppy_interrupt(irq, dev_id); return floppy_interrupt(irq, dev_id);
@@ -252,7 +253,8 @@ static int FDC2 = -1;
* is needed to prevent corrupted CMOS RAM in case "insmod floppy" * is needed to prevent corrupted CMOS RAM in case "insmod floppy"
* coincides with another rtc CMOS user. Paul G. * coincides with another rtc CMOS user. Paul G.
*/ */
#define FLOPPY0_TYPE ({ \ #define FLOPPY0_TYPE \
({ \
unsigned long flags; \ unsigned long flags; \
unsigned char val; \ unsigned char val; \
spin_lock_irqsave(&rtc_lock, flags); \ spin_lock_irqsave(&rtc_lock, flags); \
@@ -261,7 +263,8 @@ static int FDC2 = -1;
val; \ val; \
}) })
#define FLOPPY1_TYPE ({ \ #define FLOPPY1_TYPE \
({ \
unsigned long flags; \ unsigned long flags; \
unsigned char val; \ unsigned char val; \
spin_lock_irqsave(&rtc_lock, flags); \ spin_lock_irqsave(&rtc_lock, flags); \