diff options
Diffstat (limited to 'include/asm-sparc64/floppy.h')
-rw-r--r-- | include/asm-sparc64/floppy.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h index dbe033e494db..4aa0925e1b1b 100644 --- a/include/asm-sparc64/floppy.h +++ b/include/asm-sparc64/floppy.h | |||
@@ -549,7 +549,7 @@ static int __init ebus_fdthree_p(struct linux_ebus_device *edev) | |||
549 | if (!strcmp(edev->prom_node->name, "fdthree")) | 549 | if (!strcmp(edev->prom_node->name, "fdthree")) |
550 | return 1; | 550 | return 1; |
551 | if (!strcmp(edev->prom_node->name, "floppy")) { | 551 | if (!strcmp(edev->prom_node->name, "floppy")) { |
552 | char *compat; | 552 | const char *compat; |
553 | 553 | ||
554 | compat = of_get_property(edev->prom_node, | 554 | compat = of_get_property(edev->prom_node, |
555 | "compatible", NULL); | 555 | "compatible", NULL); |
@@ -661,7 +661,7 @@ static unsigned long __init sun_floppy_init(void) | |||
661 | struct linux_ebus_device *edev = NULL; | 661 | struct linux_ebus_device *edev = NULL; |
662 | unsigned long config = 0; | 662 | unsigned long config = 0; |
663 | void __iomem *auxio_reg; | 663 | void __iomem *auxio_reg; |
664 | char *state_prop; | 664 | const char *state_prop; |
665 | 665 | ||
666 | for_each_ebus(ebus) { | 666 | for_each_ebus(ebus) { |
667 | for_each_ebusdev(edev, ebus) { | 667 | for_each_ebusdev(edev, ebus) { |
@@ -854,4 +854,15 @@ static unsigned long __init sun_floppy_init(void) | |||
854 | 854 | ||
855 | #define EXTRA_FLOPPY_PARAMS | 855 | #define EXTRA_FLOPPY_PARAMS |
856 | 856 | ||
857 | static DEFINE_SPINLOCK(dma_spin_lock); | ||
858 | |||
859 | #define claim_dma_lock() \ | ||
860 | ({ unsigned long flags; \ | ||
861 | spin_lock_irqsave(&dma_spin_lock, flags); \ | ||
862 | flags; \ | ||
863 | }) | ||
864 | |||
865 | #define release_dma_lock(__flags) \ | ||
866 | spin_unlock_irqrestore(&dma_spin_lock, __flags); | ||
867 | |||
857 | #endif /* !(__ASM_SPARC64_FLOPPY_H) */ | 868 | #endif /* !(__ASM_SPARC64_FLOPPY_H) */ |