floppy: replace NO_GEOM macro with a function
Subsystems (2)
PATCH 1/1 floppy: replace NO_GEOM macro with a function
This patch replaces the NO_GEOM macro with a proper static inline function and converts an open-coded caller in check_floppy_change() to use it.
Cc Stephen Hemminger <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Jens Axboe <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
--- drivers/block/floppy.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
drivers/block/floppy.c +10 -5
@@ -597,6 +597,11 @@ static unsigned char fsector_t; /* sector in track */static unsigned char in_sector_offset;/* offset within physical sector, * expressed in units of 512 bytes */ +static inline bool drive_no_geom (int drive) +{ +return !current_type[drive] && !ITYPE (UDRS ->fd_device); +} +#ifndef fd_ejectstatic inline int fd_eject (int drive) {
@@ -3782,7 +3787,7 @@ static int check_floppy_change(struct gendisk *disk)if (test_bit (FD_DISK_CHANGED_BIT , &UDRS ->flags) ||test_bit (FD_VERIFY_BIT , &UDRS ->flags) ||test_bit (drive, &fake_change) || - (!ITYPE (UDRS ->fd_device) && !current_type[drive])) +drive_no_geom (drive))return 1 ;return 0 ; }
@@ -3848,13 +3853,13 @@ static int __floppy_read_block_0(struct block_device *bdev)static int floppy_revalidate (struct gendisk *disk) {int drive = (long )disk->private_data; -#define NO_GEOM (!current_type[drive] && !ITYPE(UDRS->fd_device))int cf;int res =0 ;if (test_bit (FD_DISK_CHANGED_BIT , &UDRS ->flags) ||test_bit (FD_VERIFY_BIT , &UDRS ->flags) || -test_bit (drive, &fake_change) ||NO_GEOM ) { +test_bit (drive, &fake_change) || +drive_no_geom (drive)) {if (WARN (atomic_read (&usage_count) ==0 ,"VFS: revalidate called on non-open device.\n" ))return -EFAULT ;
@@ -3862,7 +3867,7 @@ static int floppy_revalidate(struct gendisk *disk)lock_fdc (drive, false); cf = (test_bit (FD_DISK_CHANGED_BIT , &UDRS ->flags) ||test_bit (FD_VERIFY_BIT , &UDRS ->flags)); -if (!(cf ||test_bit (drive, &fake_change) ||NO_GEOM )) { +if (!(cf ||test_bit (drive, &fake_change) ||drive_no_geom (drive))) {process_fd_request ();/*already done by another thread */ return 0 ; }
@@ -3874,7 +3879,7 @@ static int floppy_revalidate(struct gendisk *disk)clear_bit (FD_DISK_CHANGED_BIT , &UDRS ->flags);if (cf)UDRS ->generation++; -if (NO_GEOM ) { +if (drive_no_geom (drive)) {/* auto-sensing */ res =__floppy_read_block_0 (opened_bdev[drive]); }else {
Signature · 1 line
1.7.0.4
Quoted 2 lines · Pekka Enberg
This patch replaces the
NO_GEOMmacro with a proper static inline function and converts an open-coded caller incheck_floppy_change()to use it.
Thanks Pekka, applied to for-2.6.38/drivers
Signature · 1 line
Jens Axboe