diff options
| author | Geliang Tang | 2017-03-24 15:15:10 +0100 |
|---|---|---|
| committer | Jens Axboe | 2017-03-24 15:22:07 +0100 |
| commit | 68219bdf5f1d999e4bad09db0abbd9460bd93020 (patch) | |
| tree | e975baceb5390d3bce92bbd626f405f5eb2dba29 /drivers/block/floppy.c | |
| parent | block: make nr_iovecs unsigned in bio_alloc_bioset() (diff) | |
| download | kernel-qcow2-linux-68219bdf5f1d999e4bad09db0abbd9460bd93020.tar.gz kernel-qcow2-linux-68219bdf5f1d999e4bad09db0abbd9460bd93020.tar.xz kernel-qcow2-linux-68219bdf5f1d999e4bad09db0abbd9460bd93020.zip | |
block: floppy: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 45b4384f650c..ce102ec47ef2 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4207,9 +4207,7 @@ static int __init do_floppy_init(void) disks[drive]->fops = &floppy_fops; sprintf(disks[drive]->disk_name, "fd%d", drive); - init_timer(&motor_off_timer[drive]); - motor_off_timer[drive].data = drive; - motor_off_timer[drive].function = motor_off_callback; + setup_timer(&motor_off_timer[drive], motor_off_callback, drive); } err = register_blkdev(FLOPPY_MAJOR, "fd"); |