[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>

authored by

Boaz Harrosh and committed by
Jens Axboe
2b02a179 4259cb25

-23
-12
block/ll_rw_blk.c
··· 129 } 130 EXPORT_SYMBOL(blk_get_backing_dev_info); 131 132 - void blk_queue_activity_fn(request_queue_t *q, activity_fn *fn, void *data) 133 - { 134 - q->activity_fn = fn; 135 - q->activity_data = data; 136 - } 137 - EXPORT_SYMBOL(blk_queue_activity_fn); 138 - 139 /** 140 * blk_queue_prep_rq - set a prepare_request function for queue 141 * @q: queue ··· 231 * by default assume old behaviour and bounce for any highmem page 232 */ 233 blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH); 234 - 235 - blk_queue_activity_fn(q, NULL, NULL); 236 } 237 238 EXPORT_SYMBOL(blk_queue_make_request); ··· 2686 static inline void add_request(request_queue_t * q, struct request * req) 2687 { 2688 drive_stat_acct(req, req->nr_sectors, 1); 2689 - 2690 - if (q->activity_fn) 2691 - q->activity_fn(q->activity_data, rq_data_dir(req)); 2692 2693 /* 2694 * elevator indicated where it wants this request to be
··· 129 } 130 EXPORT_SYMBOL(blk_get_backing_dev_info); 131 132 /** 133 * blk_queue_prep_rq - set a prepare_request function for queue 134 * @q: queue ··· 238 * by default assume old behaviour and bounce for any highmem page 239 */ 240 blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH); 241 } 242 243 EXPORT_SYMBOL(blk_queue_make_request); ··· 2695 static inline void add_request(request_queue_t * q, struct request * req) 2696 { 2697 drive_stat_acct(req, req->nr_sectors, 1); 2698 2699 /* 2700 * elevator indicated where it wants this request to be
-4
drivers/ide/ide-probe.c
··· 1000 /* needs drive->queue to be set */ 1001 ide_toggle_bounce(drive, 1); 1002 1003 - /* enable led activity for disk drives only */ 1004 - if (drive->media == ide_disk && hwif->led_act) 1005 - blk_queue_activity_fn(q, hwif->led_act, drive); 1006 - 1007 return 0; 1008 } 1009
··· 1000 /* needs drive->queue to be set */ 1001 ide_toggle_bounce(drive, 1); 1002 1003 return 0; 1004 } 1005
-5
include/linux/blkdev.h
··· 342 343 struct bio_vec; 344 typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *); 345 - typedef void (activity_fn) (void *data, int rw); 346 typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *); 347 typedef void (prepare_flush_fn) (request_queue_t *, struct request *); 348 typedef void (softirq_done_fn)(struct request *); ··· 383 prep_rq_fn *prep_rq_fn; 384 unplug_fn *unplug_fn; 385 merge_bvec_fn *merge_bvec_fn; 386 - activity_fn *activity_fn; 387 issue_flush_fn *issue_flush_fn; 388 prepare_flush_fn *prepare_flush_fn; 389 softirq_done_fn *softirq_done_fn; ··· 408 * ll_rw_blk doesn't touch it. 409 */ 410 void *queuedata; 411 - 412 - void *activity_data; 413 414 /* 415 * queue needs bounce pages for pages above this limit ··· 673 extern void __blk_stop_queue(request_queue_t *q); 674 extern void blk_run_queue(request_queue_t *); 675 extern void blk_start_queueing(request_queue_t *); 676 - extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *); 677 extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long); 678 extern int blk_rq_unmap_user(struct request *); 679 extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t);
··· 342 343 struct bio_vec; 344 typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *); 345 typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *); 346 typedef void (prepare_flush_fn) (request_queue_t *, struct request *); 347 typedef void (softirq_done_fn)(struct request *); ··· 384 prep_rq_fn *prep_rq_fn; 385 unplug_fn *unplug_fn; 386 merge_bvec_fn *merge_bvec_fn; 387 issue_flush_fn *issue_flush_fn; 388 prepare_flush_fn *prepare_flush_fn; 389 softirq_done_fn *softirq_done_fn; ··· 410 * ll_rw_blk doesn't touch it. 411 */ 412 void *queuedata; 413 414 /* 415 * queue needs bounce pages for pages above this limit ··· 677 extern void __blk_stop_queue(request_queue_t *q); 678 extern void blk_run_queue(request_queue_t *); 679 extern void blk_start_queueing(request_queue_t *); 680 extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long); 681 extern int blk_rq_unmap_user(struct request *); 682 extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t);
-2
include/linux/ide.h
··· 804 void *hwif_data; /* extra hwif data */ 805 806 unsigned dma; 807 - 808 - void (*led_act)(void *data, int rw); 809 } ____cacheline_internodealigned_in_smp ide_hwif_t; 810 811 /*
··· 804 void *hwif_data; /* extra hwif data */ 805 806 unsigned dma; 807 } ____cacheline_internodealigned_in_smp ide_hwif_t; 808 809 /*