projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6
[powerpc.git]
/
drivers
/
ide
/
ide-floppy.c
diff --git
a/drivers/ide/ide-floppy.c
b/drivers/ide/ide-floppy.c
index
5945f55
..
1f8db9a
100644
(file)
--- a/
drivers/ide/ide-floppy.c
+++ b/
drivers/ide/ide-floppy.c
@@
-1871,9
+1871,8
@@
static void idefloppy_setup (ide_drive_t *drive, idefloppy_floppy_t *floppy)
idefloppy_add_settings(drive);
}
idefloppy_add_settings(drive);
}
-static
int ide_floppy_remove(struct device *dev
)
+static
void ide_floppy_remove(ide_drive_t *drive
)
{
{
- ide_drive_t *drive = to_ide_device(dev);
idefloppy_floppy_t *floppy = drive->driver_data;
struct gendisk *g = floppy->disk;
idefloppy_floppy_t *floppy = drive->driver_data;
struct gendisk *g = floppy->disk;
@@
-1882,8
+1881,6
@@
static int ide_floppy_remove(struct device *dev)
del_gendisk(g);
ide_floppy_put(floppy);
del_gendisk(g);
ide_floppy_put(floppy);
-
- return 0;
}
static void ide_floppy_release(struct kref *kref)
}
static void ide_floppy_release(struct kref *kref)
@@
-1922,16
+1919,16
@@
static ide_proc_entry_t idefloppy_proc[] = {
#endif /* CONFIG_PROC_FS */
#endif /* CONFIG_PROC_FS */
-static int ide_floppy_probe(
struct device
*);
+static int ide_floppy_probe(
ide_drive_t
*);
static ide_driver_t idefloppy_driver = {
.gen_driver = {
.owner = THIS_MODULE,
.name = "ide-floppy",
.bus = &ide_bus_type,
static ide_driver_t idefloppy_driver = {
.gen_driver = {
.owner = THIS_MODULE,
.name = "ide-floppy",
.bus = &ide_bus_type,
- .probe = ide_floppy_probe,
- .remove = ide_floppy_remove,
},
},
+ .probe = ide_floppy_probe,
+ .remove = ide_floppy_remove,
.version = IDEFLOPPY_VERSION,
.media = ide_floppy,
.supports_dsc_overlap = 0,
.version = IDEFLOPPY_VERSION,
.media = ide_floppy,
.supports_dsc_overlap = 0,
@@
-2136,9
+2133,8
@@
static struct block_device_operations idefloppy_ops = {
.revalidate_disk= idefloppy_revalidate_disk
};
.revalidate_disk= idefloppy_revalidate_disk
};
-static int ide_floppy_probe(
struct device *dev
)
+static int ide_floppy_probe(
ide_drive_t *drive
)
{
{
- ide_drive_t *drive = to_ide_device(dev);
idefloppy_floppy_t *floppy;
struct gendisk *g;
idefloppy_floppy_t *floppy;
struct gendisk *g;