diff options
| -rw-r--r-- | drivers/block/amiflop.c | 3 | ||||
| -rw-r--r-- | drivers/block/ll_rw_blk.c | 4 | ||||
| -rw-r--r-- | drivers/usb/input/hiddev.c | 6 |
3 files changed, 2 insertions, 11 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 9a2d64da6330..9d6408851f25 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -1586,7 +1586,6 @@ static int floppy_open(struct inode *inode, struct file *filp) int drive = minor(inode->i_rdev) & 3; int system = (minor(inode->i_rdev) & 4) >> 2; int old_dev; - int system; unsigned long flags; old_dev = fd_device[drive]; @@ -1621,7 +1620,7 @@ static int floppy_open(struct inode *inode, struct file *filp) restore_flags(flags); if (old_dev != system) - invalidate_buffers(mk_kdev(MAJOR_NR, drive + (system << 2)); + invalidate_buffers(mk_kdev(MAJOR_NR, drive + (system << 2))); unit[drive].dtype=&data_types[system]; unit[drive].blocks=unit[drive].type->heads*unit[drive].type->tracks* diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index 7698b794961d..0f06a60f023e 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c @@ -1386,7 +1386,6 @@ void blk_insert_request(request_queue_t *q, struct request *rq, void drive_stat_acct(struct request *rq, int nr_sectors, int new_io) { int rw = rq_data_dir(rq); - unsigned int major, index; if (!rq->rq_disk) return; @@ -1404,9 +1403,6 @@ void drive_stat_acct(struct request *rq, int nr_sectors, int new_io) disk_round_stats(rq->rq_disk); rq->rq_disk->in_flight++; } - - major = rq->rq_disk->major; - index = rq->rq_disk->first_minor >> rq->rq_disk->minor_shift; } /* diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index 68ac9b67745b..bfbbee12d598 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c @@ -765,11 +765,7 @@ static /* const */ struct usb_driver hiddev_driver = { int __init hiddev_init(void) { - devfs_handle_t de; - - de = devfs_get_handle(NULL, "usb", 0, 0, 0, 0); - hiddev_devfs_handle = devfs_mk_dir(de, "hid", NULL); - devfs_put(de); + hiddev_devfs_handle = devfs_mk_dir(NULL, "usb/hid", NULL); usb_register(&hiddev_driver); return 0; } |