summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-17 18:09:10 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-17 18:09:10 +0200
commit8f29cd9f12e97d46e601f59810ea6aadd938945d (patch)
treea6af2e1ed03a7193394a3b158c58ea411e35881c /drivers/ide
parentide-{disk,floppy}: set IDE_DFLAG_ATTACH in *_setup() (diff)
downloadlinux-8f29cd9f12e97d46e601f59810ea6aadd938945d.tar.xz
linux-8f29cd9f12e97d46e601f59810ea6aadd938945d.zip
ide-floppy: drop 'floppy' argument from idefloppy_setup()
Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-floppy.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index bcbd980f7a48..4a3d7e08b65a 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -560,8 +560,9 @@ sector_t ide_floppy_capacity(ide_drive_t *drive)
return capacity;
}
-static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
+static void idefloppy_setup(ide_drive_t *drive)
{
+ struct ide_floppy_obj *floppy = drive->driver_data;
u16 *id = drive->id;
drive->pc_callback = ide_floppy_callback;
@@ -808,7 +809,7 @@ static int ide_floppy_probe(ide_drive_t *drive)
drive->debug_mask = debug_mask;
- idefloppy_setup(drive, floppy);
+ idefloppy_setup(drive);
g->minors = 1 << PARTN_BITS;
g->driverfs_dev = &drive->gendev;