Re: [PATCH 06/19] swim: simplify media change handling

[Hannes Reinecke]

On 9/8/20 4:53 PM, Christoph Hellwig wrote:
> floppy_revalidate mostly duplicates work already done in floppy_open
> despite only beeing called from floppy_open.  Remove the function and
> just clear the ->ejected flag directly under the right condition.
> 
> Signed-off-by: Christoph Hellwig 
> Reviewed-by: Johannes Thumshirn 
> ---
>  drivers/block/swim.c | 24 ++--
>  1 file changed, 2 insertions(+), 22 deletions(-)
> 
What a convoluted driver.

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 06/19] swim: simplify media change handling

[Christoph Hellwig]

floppy_revalidate mostly duplicates work already done in floppy_open
despite only beeing called from floppy_open.  Remove the function and
just clear the ->ejected flag directly under the right condition.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Johannes Thumshirn 
---
 drivers/block/swim.c | 24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index d4565c555b289f..52dd1efa00f9c5 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -217,8 +217,6 @@ extern int swim_read_sector_header(struct swim __iomem 
*base,
 extern int swim_read_sector_data(struct swim __iomem *base,
 unsigned char *data);
 
-static int floppy_revalidate(struct gendisk *disk);
-
 static DEFINE_MUTEX(swim_mutex);
 static inline void set_swim_mode(struct swim __iomem *base, int enable)
 {
@@ -640,8 +638,8 @@ static int floppy_open(struct block_device *bdev, fmode_t 
mode)
return 0;
 
if (mode & (FMODE_READ|FMODE_WRITE)) {
-   if (bdev_check_media_change(bdev))
-   floppy_revalidate(bdev->bd_disk);
+   if (bdev_check_media_change(bdev) && fs->disk_in)
+   fs->ejected = 0;
if ((mode & FMODE_WRITE) && fs->write_protected) {
err = -EROFS;
goto out;
@@ -738,24 +736,6 @@ static unsigned int floppy_check_events(struct gendisk 
*disk,
return fs->ejected ? DISK_EVENT_MEDIA_CHANGE : 0;
 }
 
-static int floppy_revalidate(struct gendisk *disk)
-{
-   struct floppy_state *fs = disk->private_data;
-   struct swim __iomem *base = fs->swd->base;
-
-   swim_drive(base, fs->location);
-
-   if (fs->ejected)
-   setup_medium(fs);
-
-   if (!fs->disk_in)
-   swim_motor(base, OFF);
-   else
-   fs->ejected = 0;
-
-   return !fs->disk_in;
-}
-
 static const struct block_device_operations floppy_fops = {
.owner   = THIS_MODULE,
.open= floppy_unlocked_open,
-- 
2.28.0

Re: [PATCH 06/19] swim: simplify media change handling

[Johannes Thumshirn]

And down by one,
Reviewed-by: Johannes Thumshirn 

[PATCH 06/19] swim: simplify media change handling

[Christoph Hellwig]

floppy_revalidate mostly duplicates work already done in floppy_open
despite only beeing called from floppy_open.  Remove the function and
just clear the ->ejected flag directly under the right condition.

Signed-off-by: Christoph Hellwig 
---
 drivers/block/swim.c | 24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index d4565c555b289f..52dd1efa00f9c5 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -217,8 +217,6 @@ extern int swim_read_sector_header(struct swim __iomem 
*base,
 extern int swim_read_sector_data(struct swim __iomem *base,
 unsigned char *data);
 
-static int floppy_revalidate(struct gendisk *disk);
-
 static DEFINE_MUTEX(swim_mutex);
 static inline void set_swim_mode(struct swim __iomem *base, int enable)
 {
@@ -640,8 +638,8 @@ static int floppy_open(struct block_device *bdev, fmode_t 
mode)
return 0;
 
if (mode & (FMODE_READ|FMODE_WRITE)) {
-   if (bdev_check_media_change(bdev))
-   floppy_revalidate(bdev->bd_disk);
+   if (bdev_check_media_change(bdev) && fs->disk_in)
+   fs->ejected = 0;
if ((mode & FMODE_WRITE) && fs->write_protected) {
err = -EROFS;
goto out;
@@ -738,24 +736,6 @@ static unsigned int floppy_check_events(struct gendisk 
*disk,
return fs->ejected ? DISK_EVENT_MEDIA_CHANGE : 0;
 }
 
-static int floppy_revalidate(struct gendisk *disk)
-{
-   struct floppy_state *fs = disk->private_data;
-   struct swim __iomem *base = fs->swd->base;
-
-   swim_drive(base, fs->location);
-
-   if (fs->ejected)
-   setup_medium(fs);
-
-   if (!fs->disk_in)
-   swim_motor(base, OFF);
-   else
-   fs->ejected = 0;
-
-   return !fs->disk_in;
-}
-
 static const struct block_device_operations floppy_fops = {
.owner   = THIS_MODULE,
.open= floppy_unlocked_open,
-- 
2.28.0