Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ide: remove ide_{,un}register_region

There is no need to ever register the fake gendisk used for ide-tape.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
d18e8b1b a160c615

-37
-32
drivers/ide/ide-probe.c
··· 929 929 return NULL; 930 930 } 931 931 932 - static struct kobject *exact_match(dev_t dev, int *part, void *data) 933 - { 934 - struct gendisk *p = data; 935 - *part &= (1 << PARTN_BITS) - 1; 936 - return &disk_to_dev(p)->kobj; 937 - } 938 - 939 - static int exact_lock(dev_t dev, void *data) 940 - { 941 - struct gendisk *p = data; 942 - 943 - if (!get_disk_and_module(p)) 944 - return -1; 945 - return 0; 946 - } 947 - 948 - void ide_register_region(struct gendisk *disk) 949 - { 950 - blk_register_region(MKDEV(disk->major, disk->first_minor), 951 - disk->minors, NULL, exact_match, exact_lock, disk); 952 - } 953 - 954 - EXPORT_SYMBOL_GPL(ide_register_region); 955 - 956 - void ide_unregister_region(struct gendisk *disk) 957 - { 958 - blk_unregister_region(MKDEV(disk->major, disk->first_minor), 959 - disk->minors); 960 - } 961 - 962 - EXPORT_SYMBOL_GPL(ide_unregister_region); 963 - 964 932 void ide_init_disk(struct gendisk *disk, ide_drive_t *drive) 965 933 { 966 934 ide_hwif_t *hwif = drive->hwif;
-2
drivers/ide/ide-tape.c
··· 1822 1822 1823 1823 ide_proc_unregister_driver(drive, tape->driver); 1824 1824 device_del(&tape->dev); 1825 - ide_unregister_region(tape->disk); 1826 1825 1827 1826 mutex_lock(&idetape_ref_mutex); 1828 1827 put_device(&tape->dev); ··· 2025 2026 "n%s", tape->name); 2026 2027 2027 2028 g->fops = &idetape_block_ops; 2028 - ide_register_region(g); 2029 2029 2030 2030 return 0; 2031 2031
-3
include/linux/ide.h
··· 1493 1493 static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {} 1494 1494 #endif 1495 1495 1496 - void ide_register_region(struct gendisk *); 1497 - void ide_unregister_region(struct gendisk *); 1498 - 1499 1496 void ide_check_nien_quirk_list(ide_drive_t *); 1500 1497 void ide_undecoded_slave(ide_drive_t *); 1501 1498