diff options
| author | Denis Efremov <efremov@linux.com> | 2020-05-01 15:44:14 +0200 |
|---|---|---|
| committer | Denis Efremov <efremov@linux.com> | 2020-05-12 18:34:56 +0200 |
| commit | 9c4c5a24c85585fb8904bd2872501cd8181b3854 (patch) | |
| tree | 8c380d989762ff49269299c2ad877c6c1929c8bd /drivers/block | |
| parent | floppy: use print_hex_dump() in setup_DMA() (diff) | |
| download | linux-9c4c5a24c85585fb8904bd2872501cd8181b3854.tar.xz linux-9c4c5a24c85585fb8904bd2872501cd8181b3854.zip | |
floppy: add FD_AUTODETECT_SIZE define for struct floppy_drive_params
Use FD_AUTODETECT_SIZE for autodetect buffer size in struct
floppy_drive_params instead of a magic number.
Link: https://lore.kernel.org/r/20200501134416.72248-3-efremov@linux.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Denis Efremov <efremov@linux.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3ab6e804b5ec..b82b3d38b834 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -2073,7 +2073,8 @@ static int next_valid_format(int drive) probed_format = drive_state[drive].probed_format; while (1) { - if (probed_format >= 8 || !drive_params[drive].autodetect[probed_format]) { + if (probed_format >= FD_AUTODETECT_SIZE || + !drive_params[drive].autodetect[probed_format]) { drive_state[drive].probed_format = 0; return 1; } @@ -3442,13 +3443,13 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo) return 0; } -static bool valid_floppy_drive_params(const short autodetect[8], +static bool valid_floppy_drive_params(const short autodetect[FD_AUTODETECT_SIZE], int native_format) { size_t floppy_type_size = ARRAY_SIZE(floppy_type); size_t i = 0; - for (i = 0; i < 8; ++i) { + for (i = 0; i < FD_AUTODETECT_SIZE; ++i) { if (autodetect[i] < 0 || autodetect[i] >= floppy_type_size) return false; @@ -3673,7 +3674,7 @@ struct compat_floppy_drive_params { struct floppy_max_errors max_errors; char flags; char read_track; - short autodetect[8]; + short autodetect[FD_AUTODETECT_SIZE]; compat_int_t checkfreq; compat_int_t native_format; }; |