diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-03-04 11:23:46 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-03-04 11:28:31 +0100 |
| commit | 1826eadfc42839af7c1c5a1859510aff635d3fa1 (patch) | |
| tree | 387895990fb3db91cbf9d82d33f5df27d62a0219 | |
| parent | ff88972c850ced92b9c4c7f538d85829c741eeb0 (diff) | |
| download | kernel-crypto-1826eadfc42839af7c1c5a1859510aff635d3fa1.tar.gz kernel-crypto-1826eadfc42839af7c1c5a1859510aff635d3fa1.tar.xz kernel-crypto-1826eadfc42839af7c1c5a1859510aff635d3fa1.zip | |
block/genhd.c: cleanups
This patch contains the following cleanups:
- make the needlessly global struct disk_type static
- #if 0 the unused genhd_media_change_notify()
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | block/genhd.c | 6 | ||||
| -rw-r--r-- | include/linux/genhd.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/block/genhd.c b/block/genhd.c index abc6feddc8c..c44527d16c5 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -24,6 +24,8 @@ static DEFINE_MUTEX(block_class_lock); struct kobject *block_depr; #endif +static struct device_type disk_type; + /* * Can be deleted altogether. Later. * @@ -502,7 +504,7 @@ struct class block_class = { .name = "block", }; -struct device_type disk_type = { +static struct device_type disk_type = { .name = "disk", .groups = disk_attr_groups, .release = disk_release, @@ -632,12 +634,14 @@ static void media_change_notify_thread(struct work_struct *work) put_device(gd->driverfs_dev); } +#if 0 void genhd_media_change_notify(struct gendisk *disk) { get_device(disk->driverfs_dev); schedule_work(&disk->async_notify); } EXPORT_SYMBOL_GPL(genhd_media_change_notify); +#endif /* 0 */ dev_t blk_lookup_devt(const char *name) { diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 09a3b18918c..cd048e3cc96 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -18,7 +18,6 @@ #define dev_to_disk(device) container_of(device, struct gendisk, dev) #define dev_to_part(device) container_of(device, struct hd_struct, dev) -extern struct device_type disk_type; extern struct device_type part_type; extern struct kobject *block_depr; extern struct class block_class; @@ -556,7 +555,6 @@ extern struct gendisk *alloc_disk_node(int minors, int node_id); extern struct gendisk *alloc_disk(int minors); extern struct kobject *get_disk(struct gendisk *disk); extern void put_disk(struct gendisk *disk); -extern void genhd_media_change_notify(struct gendisk *disk); extern void blk_register_region(dev_t devt, unsigned long range, struct module *module, struct kobject *(*probe)(dev_t, int *, void *), |