summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2006-12-05 10:19:14 +0100
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-12-12 10:22:23 +0100
commit2b02a1792000900ead4638f4d42fcdd742062cfa (patch)
treea996a02cd8d028fd53223bd17ae8793185d94702 /block
parent4259cb25d436a79bf6b07d8075423573567c211d (diff)
downloadlinux-3.10-2b02a1792000900ead4638f4d42fcdd742062cfa.tar.gz
linux-3.10-2b02a1792000900ead4638f4d42fcdd742062cfa.tar.bz2
linux-3.10-2b02a1792000900ead4638f4d42fcdd742062cfa.zip
[PATCH] remove blk_queue_activity_fn
While working on bidi support at struct request level I have found that blk_queue_activity_fn is actually never used. The only user is in ide-probe.c with this code: /* enable led activity for disk drives only */ if (drive->media == ide_disk && hwif->led_act) blk_queue_activity_fn(q, hwif->led_act, drive); And led_act is never initialized anywhere. (Looking back at older kernels it was used in the PPC arch, but was removed around 2.6.18) Unless it is all for future use off course. (this patch is against linux-2.6-block.git as off 2006/12/4) Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/ll_rw_blk.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 785e61c9a81..a541b42c08e 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -129,13 +129,6 @@ struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev)
}
EXPORT_SYMBOL(blk_get_backing_dev_info);
-void blk_queue_activity_fn(request_queue_t *q, activity_fn *fn, void *data)
-{
- q->activity_fn = fn;
- q->activity_data = data;
-}
-EXPORT_SYMBOL(blk_queue_activity_fn);
-
/**
* blk_queue_prep_rq - set a prepare_request function for queue
* @q: queue
@@ -238,8 +231,6 @@ void blk_queue_make_request(request_queue_t * q, make_request_fn * mfn)
* by default assume old behaviour and bounce for any highmem page
*/
blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);
-
- blk_queue_activity_fn(q, NULL, NULL);
}
EXPORT_SYMBOL(blk_queue_make_request);
@@ -2696,9 +2687,6 @@ static inline void add_request(request_queue_t * q, struct request * req)
{
drive_stat_acct(req, req->nr_sectors, 1);
- if (q->activity_fn)
- q->activity_fn(q->activity_data, rq_data_dir(req));
-
/*
* elevator indicated where it wants this request to be
* inserted at elevator_merge time