diff options
author | Russell King <rmk@arm.linux.org.uk> | 2006-01-06 06:41:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 14:26:10 -0500 |
commit | 4031bbe4bbec6c0fe50412ef7fb43a270b0f29f1 (patch) | |
tree | 1e1449ba492ab04d8c5fbc75f9761be237bcae72 /drivers/ide/ide-floppy.c | |
parent | bbbe3a41f7ee529f7f4fdcc1bc1157234bac0766 (diff) |
[PATCH] Add ide_bus_type probe and remove methods
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5945f551aaaa..1f8db9ac05d1 100644 --- 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) | |||
1871 | idefloppy_add_settings(drive); | 1871 | idefloppy_add_settings(drive); |
1872 | } | 1872 | } |
1873 | 1873 | ||
1874 | static int ide_floppy_remove(struct device *dev) | 1874 | static void ide_floppy_remove(ide_drive_t *drive) |
1875 | { | 1875 | { |
1876 | ide_drive_t *drive = to_ide_device(dev); | ||
1877 | idefloppy_floppy_t *floppy = drive->driver_data; | 1876 | idefloppy_floppy_t *floppy = drive->driver_data; |
1878 | struct gendisk *g = floppy->disk; | 1877 | struct gendisk *g = floppy->disk; |
1879 | 1878 | ||
@@ -1882,8 +1881,6 @@ static int ide_floppy_remove(struct device *dev) | |||
1882 | del_gendisk(g); | 1881 | del_gendisk(g); |
1883 | 1882 | ||
1884 | ide_floppy_put(floppy); | 1883 | ide_floppy_put(floppy); |
1885 | |||
1886 | return 0; | ||
1887 | } | 1884 | } |
1888 | 1885 | ||
1889 | static void ide_floppy_release(struct kref *kref) | 1886 | static void ide_floppy_release(struct kref *kref) |
@@ -1922,16 +1919,16 @@ static ide_proc_entry_t idefloppy_proc[] = { | |||
1922 | 1919 | ||
1923 | #endif /* CONFIG_PROC_FS */ | 1920 | #endif /* CONFIG_PROC_FS */ |
1924 | 1921 | ||
1925 | static int ide_floppy_probe(struct device *); | 1922 | static int ide_floppy_probe(ide_drive_t *); |
1926 | 1923 | ||
1927 | static ide_driver_t idefloppy_driver = { | 1924 | static ide_driver_t idefloppy_driver = { |
1928 | .gen_driver = { | 1925 | .gen_driver = { |
1929 | .owner = THIS_MODULE, | 1926 | .owner = THIS_MODULE, |
1930 | .name = "ide-floppy", | 1927 | .name = "ide-floppy", |
1931 | .bus = &ide_bus_type, | 1928 | .bus = &ide_bus_type, |
1932 | .probe = ide_floppy_probe, | ||
1933 | .remove = ide_floppy_remove, | ||
1934 | }, | 1929 | }, |
1930 | .probe = ide_floppy_probe, | ||
1931 | .remove = ide_floppy_remove, | ||
1935 | .version = IDEFLOPPY_VERSION, | 1932 | .version = IDEFLOPPY_VERSION, |
1936 | .media = ide_floppy, | 1933 | .media = ide_floppy, |
1937 | .supports_dsc_overlap = 0, | 1934 | .supports_dsc_overlap = 0, |
@@ -2136,9 +2133,8 @@ static struct block_device_operations idefloppy_ops = { | |||
2136 | .revalidate_disk= idefloppy_revalidate_disk | 2133 | .revalidate_disk= idefloppy_revalidate_disk |
2137 | }; | 2134 | }; |
2138 | 2135 | ||
2139 | static int ide_floppy_probe(struct device *dev) | 2136 | static int ide_floppy_probe(ide_drive_t *drive) |
2140 | { | 2137 | { |
2141 | ide_drive_t *drive = to_ide_device(dev); | ||
2142 | idefloppy_floppy_t *floppy; | 2138 | idefloppy_floppy_t *floppy; |
2143 | struct gendisk *g; | 2139 | struct gendisk *g; |
2144 | 2140 | ||