Commit a367e440 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

ide-cd: remove idecd_revalidate_disk 



Just merge the trivial function into its only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a22be69d

drivers/ide/ide-cd.c

+5 −12
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static DEFINE_MUTEX(ide_cd_mutex); 
static DEFINE_MUTEX(idecd_ref_mutex);



static void ide_cd_release(struct device *);

static int idecd_revalidate_disk(struct gendisk *disk);



static struct cdrom_info *ide_cd_get(struct gendisk *disk)

{
@@ -1612,8 +1611,11 @@ static int idecd_open(struct block_device *bdev, fmode_t mode) 
	struct cdrom_info *info;

	int rc = -ENXIO;



	if (bdev_check_media_change(bdev))

		idecd_revalidate_disk(bdev->bd_disk);

	if (bdev_check_media_change(bdev)) {

		info = ide_drv_g(bdev->bd_disk, cdrom_info);



		ide_cd_read_toc(info->drive);

	}



	mutex_lock(&ide_cd_mutex);

	info = ide_cd_get(bdev->bd_disk);
@@ -1755,15 +1757,6 @@ static unsigned int idecd_check_events(struct gendisk *disk, 
	return cdrom_check_events(&info->devinfo, clearing);

}



static int idecd_revalidate_disk(struct gendisk *disk)

{

	struct cdrom_info *info = ide_drv_g(disk, cdrom_info);



	ide_cd_read_toc(info->drive);



	return  0;

}



static const struct block_device_operations idecd_ops = {

	.owner			= THIS_MODULE,

	.open			= idecd_open,