Re: [PATCH 13/19] ide-cd: remove idecd_revalidate_disk

2020-09-09 Thread Hannes Reinecke 
On 9/8/20 4:53 PM, Christoph Hellwig wrote:
> Just merge the trivial function into its only caller.
> 
> Signed-off-by: Christoph Hellwig 
> Reviewed-by: Johannes Thumshirn 
> ---
>  drivers/ide/ide-cd.c | 17 +
>  1 file changed, 5 insertions(+), 12 deletions(-)
> 
Reviewed-by: Hannes Reinecke 

Cheers,

Hannes
-- 
Dr. Hannes ReineckeKernel Storage Architect
h...@suse.de  +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Felix Imendörffer

[PATCH 13/19] ide-cd: remove idecd_revalidate_disk

2020-09-08 Thread Christoph Hellwig 
Just merge the trivial function into its only caller.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Johannes Thumshirn 
---
 drivers/ide/ide-cd.c | 17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 6a38cbc80aea0d..25d2d88e82ada0 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -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(_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(>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,
-- 
2.28.0

Re: [PATCH 13/19] ide-cd: remove idecd_revalidate_disk

2020-09-02 Thread Johannes Thumshirn 
Looks good,
Reviewed-by: Johannes Thumshirn

[PATCH 13/19] ide-cd: remove idecd_revalidate_disk

2020-09-02 Thread Christoph Hellwig 
Just merge the trivial function into its only caller.

Signed-off-by: Christoph Hellwig 
---
 drivers/ide/ide-cd.c | 17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 6a38cbc80aea0d..25d2d88e82ada0 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -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(_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(>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,
-- 
2.28.0