Pull block driver updates from Jens Axboe: - floppy driver cleanup series from Willy - NVMe updates and fixes (Various) - null_blk trace improvements (Chaitanya) - bcache fixes (Coly) - md fixes (via Song) - loop block size change optimizations (Martijn) - scnprintf() use (Takashi) * tag 'for-5.7/drivers-2020-03-29' of git://git.kernel.dk/linux-block: (81 commits) null_blk: add trace in null_blk_zoned.c null_blk: add tracepoint helpers for zoned mode block: add a zone condition debug helper nvme: cleanup namespace identifier reporting in nvme_init_ns_head nvme: rename __nvme_find_ns_head to nvme_find_ns_head nvme: refactor nvme_identify_ns_descs error handling nvme-tcp: Add warning on state change failure at nvme_tcp_setup_ctrl nvme-rdma: Add warning on state change failure at nvme_rdma_setup_ctrl nvme: Fix controller creation races with teardown flow nvme: Make nvme_uninit_ctrl symmetric to nvme_init_ctrl nvme: Fix ctrl use-after-free during sysfs deletion nvme-pci: Re-order nvme_pci_free_ctrl nvme: Remove unused return code from nvme_delete_ctrl_sync nvme: Use nvme_state_terminal helper nvme: release ida resources nvme: Add compat_ioctl handler for NVME_IOCTL_SUBMIT_IO nvmet-tcp: optimize tcp stack TX when data digest is used nvme-fabrics: Use scnprintf() for avoiding potential buffer overflow nvme-multipath: do not reset on unknown status nvmet-rdma: allocate RW ctxs according to mdts ...
Showing the changes to include/uapi (1 of 39 files). Show all
Unified · Split
| @@ -7,26 +7,18 @@ · 6 unmodified lines | ||
| 7 | 7 | * Handbook", Sanches and Canton. |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | −#ifdef FDPATCHES | |
| 11 | −#define FD_IOPORT fdc_state[fdc].address | |
| 12 | −#else | |
| 13 | −/* It would be a lot saner just to force fdc_state[fdc].address to always | |
| 14 | − be set ! FIXME */ | |
| 15 | −#define FD_IOPORT 0x3f0 | |
| 16 | −#endif | |
| 17 | − | |
| 18 | 10 | /* Fd controller regs. S&C, about page 340 */ |
| 19 | −#define FD_STATUS (4 + FD_IOPORT ) | |
| 20 | −#define FD_DATA (5 + FD_IOPORT ) | |
| 11 | +#define FD_STATUS 4 | |
| 12 | +#define FD_DATA 5 | |
| 21 | 13 | |
| 22 | 14 | /* Digital Output Register */ |
| 23 | −#define FD_DOR (2 + FD_IOPORT ) | |
| 15 | +#define FD_DOR 2 | |
| 24 | 16 | |
| 25 | 17 | /* Digital Input Register (read) */ |
| 26 | −#define FD_DIR (7 + FD_IOPORT ) | |
| 18 | +#define FD_DIR 7 | |
| 27 | 19 | |
| 28 | 20 | /* Diskette Control Register (write)*/ |
| 29 | −#define FD_DCR (7 + FD_IOPORT ) | |
| 21 | +#define FD_DCR 7 | |
| 30 | 22 | |
| 31 | 23 | /* Bits of main status register */ |
| 32 | 24 | #define STATUS_BUSYMASK 0x0F /* drive busy mask */ |