Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1826eadf authored by Adrian Bunk's avatar Adrian Bunk Committed by Jens Axboe
Browse files

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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent ff88972c

block/genhd.c

+5 −1
Original line number Diff line number Diff line
@@ -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)

{

include/linux/genhd.h

+0 −2
Original line number Diff line number Diff line
@@ -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 *),