[GIT PULL] Floppy cleanups for next
From: Denis Efremov
Date: Mon Mar 16 2020 - 06:47:17 EST
Hi Jens,
The following changes since commit 5d50c8f405bf91d9d9a48628fde0f2f4ff069d7b:
Merge branch 'for-5.7/io_uring' into for-next (2020-03-14 17:20:45 -0600)
are available in the Git repository at:
https://github.com/evdenis/linux-floppy tags/floppy-for-5.7
Please pull
----------------------------------------------------------------
Floppy patches for 5.7
Cleanups from Willy Tarreau:
- expansion of macros referencing global or local variables with
equivalent code
- removal of incomplete support for second FDC from ARM code
- renaming the "fdc" global variable to "current_fdc" to differ
between global and local context
Changes were compile tested on arm, x86 arches. Changes introduce
no binary difference on x86 arch (before and after the patches).
On arm, incomplete support for second FDC removed. This set of
patches with commit 2e90ca68 ("floppy: check FDC index for errors
before assigning it") was tested with syzkaller and simple
write/read/format tests for no new issues.
Signed-off-by: Denis Efremov <efremov@xxxxxxxxx>
----------------------------------------------------------------
Willy Tarreau (16):
floppy: cleanup: expand macro FDCS
floppy: cleanup: expand macro UFDCS
floppy: cleanup: expand macro UDP
floppy: cleanup: expand macro UDRS
floppy: cleanup: expand macro UDRWE
floppy: cleanup: expand macro DP
floppy: cleanup: expand macro DRS
floppy: cleanup: expand macro DRWE
floppy: cleanup: expand the R/W / format command macros
floppy: cleanup: expand the reply_buffer macros
floppy: remove dead code for drives scanning on ARM
floppy: remove incomplete support for second FDC from ARM code
floppy: prepare ARM code to simplify base address separation
floppy: introduce new functions fdc_inb() and fdc_outb()
floppy: separate the FDC's base address from its registers
floppy: rename the global "fdc" variable to "current_fdc"
arch/arm/include/asm/floppy.h | 88 +----
drivers/block/floppy.c | 1093 +++++++++++++++++++++++++++++++----------------------------
include/uapi/linux/fdreg.h | 18 +-
3 files changed, 586 insertions(+), 613 deletions(-)