Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a3b05e8f58c95dfccbf2c824d0c68e5990571f24

Authored by Jens Axboe
Committed by Jens Axboe
1 parent 1ea25ecb72

[PATCH] Kill various deprecated/unused block layer defines/functions 

Signed-off-by: Jens Axboe <axboe@suse.de>

Showing 4 changed files with 0 additions and 32 deletions Side-by-side Diff

drivers/block/cciss.c
Diff comments   View file @ a3b05e8
... ... @@ -1229,7 +1229,6 @@
1229 1229 int nr_sectors = bio_sectors(bio);
1230 1230  
1231 1231 bio->bi_next = NULL;
1232   - blk_finished_io(len);
1233 1232 bio_endio(bio, nr_sectors << 9, status ? 0 : -EIO);
1234 1233 bio = xbh;
1235 1234 }
drivers/block/cpqarray.c
Diff comments   View file @ a3b05e8
... ... @@ -989,7 +989,6 @@
989 989 xbh = bio->bi_next;
990 990 bio->bi_next = NULL;
991 991  
992   - blk_finished_io(nr_sectors);
993 992 bio_endio(bio, nr_sectors << 9, ok ? 0 : -EIO);
994 993  
995 994 bio = xbh;
include/linux/blkdev.h
Diff comments   View file @ a3b05e8
... ... @@ -579,12 +579,6 @@
579 579 (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && blk_fs_request((rq)))
580 580  
581 581 /*
582   - * noop, requests are automagically marked as active/inactive by I/O
583   - * scheduler -- see elv_next_request
584   - */
585   -#define blk_queue_headactive(q, head_active)
586   -
587   -/*
588 582 * q->prep_rq_fn return values
589 583 */
590 584 #define BLKPREP_OK 0 /* serve it */
... ... @@ -621,11 +615,6 @@
621 615 if ((rq->bio)) \
622 616 for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next)
623 617  
624   -struct sec_size {
625   - unsigned block_size;
626   - unsigned block_size_bits;
627   -};
628   -
629 618 extern int blk_register_queue(struct gendisk *disk);
630 619 extern void blk_unregister_queue(struct gendisk *disk);
631 620 extern void register_disk(struct gendisk *dev);
... ... @@ -690,16 +679,6 @@
690 679 extern void end_request(struct request *req, int uptodate);
691 680 extern void blk_complete_request(struct request *);
692 681  
693   -static inline int rq_all_done(struct request *rq, unsigned int nr_bytes)
694   -{
695   - if (blk_fs_request(rq))
696   - return (nr_bytes >= (rq->hard_nr_sectors << 9));
697   - else if (blk_pc_request(rq))
698   - return nr_bytes >= rq->data_len;
699   -
700   - return 0;
701   -}
702   -
703 682 /*
704 683 * end_that_request_first/chunk() takes an uptodate argument. we account
705 684 * any value <= as an io error. 0 means -EIO for compatability reasons,
... ... @@ -806,14 +785,6 @@
806 785  
807 786 return retval;
808 787 }
809   -
810   -static inline int bdev_dma_aligment(struct block_device *bdev)
811   -{
812   - return queue_dma_alignment(bdev_get_queue(bdev));
813   -}
814   -
815   -#define blk_finished_io(nsects) do { } while (0)
816   -#define blk_started_io(nsects) do { } while (0)
817 788  
818 789 /* assumes size > 256 */
819 790 static inline unsigned int blksize_bits(unsigned int size)
... ... @@ -79,7 +79,6 @@
79 79 #define WRITE 1
80 80 #define READA 2 /* read-ahead - don't block if no resources */
81 81 #define SWRITE 3 /* for ll_rw_block() - wait for buffer lock */
82   -#define SPECIAL 4 /* For non-blockdevice requests in request queue */
83 82 #define READ_SYNC (READ | (1 << BIO_RW_SYNC))
84 83 #define WRITE_SYNC (WRITE | (1 << BIO_RW_SYNC))
85 84 #define WRITE_BARRIER ((1 << BIO_RW) | (1 << BIO_RW_BARRIER))