leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m68k: amiga - Floppy platform device conversion

Browse Source 
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2009-04-05 13:02:13 +02:00
parent ff2db7c5ab
commit 92183b346f
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/m68k/amiga/platform.c
View File

@ -72,6 +72,11 @@ static int __init amiga_init_devices(void)
if (AMIGAHW_PRESENT(AMI_AUDIO)) if (AMIGAHW_PRESENT(AMI_AUDIO))
platform_device_register_simple("amiga-audio", -1, NULL, 0); platform_device_register_simple("amiga-audio", -1, NULL, 0);
/* storage interfaces */
if (AMIGAHW_PRESENT(AMI_FLOPPY))
platform_device_register_simple("amiga-floppy", -1, NULL, 0);
return 0; return 0;
} }

47
drivers/block/amiflop.c
View File

@ -66,6 +66,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/elevator.h> #include <linux/elevator.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -1696,34 +1697,18 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
return get_disk(unit[drive].gendisk); return get_disk(unit[drive].gendisk);
} }
static int __init amiga_floppy_init(void) static int __init amiga_floppy_probe(struct platform_device *pdev)
{ {
int i, ret; int i, ret;
if (!MACH_IS_AMIGA)
return -ENODEV;
if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENODEV;
if (register_blkdev(FLOPPY_MAJOR,"fd")) if (register_blkdev(FLOPPY_MAJOR,"fd"))
return -EBUSY; return -EBUSY;
/*
* We request DSKPTR, DSKLEN and DSKDATA only, because the other
* floppy registers are too spreaded over the custom register space
*/
ret = -EBUSY;
if (!request_mem_region(CUSTOM_PHYSADDR+0x20, 8, "amiflop [Paula]")) {
printk("fd: cannot get floppy registers\n");
goto out_blkdev;
}
ret = -ENOMEM; ret = -ENOMEM;
if ((raw_buf = (char *)amiga_chip_alloc (RAW_BUF_SIZE, "Floppy")) == if ((raw_buf = (char *)amiga_chip_alloc (RAW_BUF_SIZE, "Floppy")) ==
NULL) { NULL) {
printk("fd: cannot get chip mem buffer\n"); printk("fd: cannot get chip mem buffer\n");
goto out_memregion; goto out_blkdev;
} }
ret = -EBUSY; ret = -EBUSY;
@ -1792,18 +1777,13 @@ out_irq2:
free_irq(IRQ_AMIGA_DSKBLK, NULL); free_irq(IRQ_AMIGA_DSKBLK, NULL);
out_irq: out_irq:
amiga_chip_free(raw_buf); amiga_chip_free(raw_buf);
out_memregion:
release_mem_region(CUSTOM_PHYSADDR+0x20, 8);
out_blkdev: out_blkdev:
unregister_blkdev(FLOPPY_MAJOR,"fd"); unregister_blkdev(FLOPPY_MAJOR,"fd");
return ret; return ret;
} }
module_init(amiga_floppy_init);
#ifdef MODULE
#if 0 /* not safe to unload */ #if 0 /* not safe to unload */
void cleanup_module(void) static int __exit amiga_floppy_remove(struct platform_device *pdev)
{ {
int i; int i;
@ -1820,12 +1800,25 @@ void cleanup_module(void)
custom.dmacon = DMAF_DISK; /* disable DMA */ custom.dmacon = DMAF_DISK; /* disable DMA */
amiga_chip_free(raw_buf); amiga_chip_free(raw_buf);
blk_cleanup_queue(floppy_queue); blk_cleanup_queue(floppy_queue);
release_mem_region(CUSTOM_PHYSADDR+0x20, 8);
unregister_blkdev(FLOPPY_MAJOR, "fd"); unregister_blkdev(FLOPPY_MAJOR, "fd");
} }
#endif #endif
#else static struct platform_driver amiga_floppy_driver = {
.driver = {
.name = "amiga-floppy",
.owner = THIS_MODULE,
},
};
static int __init amiga_floppy_init(void)
{
return platform_driver_probe(&amiga_floppy_driver, amiga_floppy_probe);
}
module_init(amiga_floppy_init);
#ifndef MODULE
static int __init amiga_floppy_setup (char *str) static int __init amiga_floppy_setup (char *str)
{ {
int n; int n;
@ -1840,3 +1833,5 @@ static int __init amiga_floppy_setup (char *str)
__setup("floppy=", amiga_floppy_setup); __setup("floppy=", amiga_floppy_setup);
#endif #endif
MODULE_ALIAS("platform:amiga-floppy");