提交 f9d322bd 编写于 作者: W Willy Tarreau 提交者: Jens Axboe

floppy: cleanup: expand macro UFDCS

This macro doesn't bring much value and only slightly obfuscates the
code by silently using local variable "drive", let's expand it.

Link: https://lore.kernel.org/r/20200224212352.8640-3-w@1wt.euSigned-off-by: NWilly Tarreau <w@1wt.eu>
Signed-off-by: NDenis Efremov <efremov@linux.com>
Signed-off-by: NJens Axboe <axboe@kernel.dk>
上级 de6048b8
...@@ -313,7 +313,6 @@ static bool initialized; ...@@ -313,7 +313,6 @@ static bool initialized;
#define UDP (&drive_params[drive]) #define UDP (&drive_params[drive])
#define UDRS (&drive_state[drive]) #define UDRS (&drive_state[drive])
#define UDRWE (&write_errors[drive]) #define UDRWE (&write_errors[drive])
#define UFDCS (&fdc_state[FDC(drive)])
#define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2) #define PH_HEAD(floppy, head) (((((floppy)->stretch & 2) >> 1) ^ head) << 2)
#define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH) #define STRETCH(floppy) ((floppy)->stretch & FD_STRETCH)
...@@ -3549,7 +3548,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int ...@@ -3549,7 +3548,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
case FDRESET: case FDRESET:
return user_reset_fdc(drive, (int)param, true); return user_reset_fdc(drive, (int)param, true);
case FDGETFDCSTAT: case FDGETFDCSTAT:
outparam = UFDCS; outparam = &fdc_state[FDC(drive)];
break; break;
case FDWERRORCLR: case FDWERRORCLR:
memset(UDRWE, 0, sizeof(*UDRWE)); memset(UDRWE, 0, sizeof(*UDRWE));
...@@ -3833,7 +3832,7 @@ static int compat_getfdcstat(int drive, ...@@ -3833,7 +3832,7 @@ static int compat_getfdcstat(int drive,
struct floppy_fdc_state v; struct floppy_fdc_state v;
mutex_lock(&floppy_mutex); mutex_lock(&floppy_mutex);
v = *UFDCS; v = fdc_state[FDC(drive)];
mutex_unlock(&floppy_mutex); mutex_unlock(&floppy_mutex);
memset(&v32, 0, sizeof(struct compat_floppy_fdc_state)); memset(&v32, 0, sizeof(struct compat_floppy_fdc_state));
...@@ -4062,8 +4061,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) ...@@ -4062,8 +4061,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
buffer_track = -1; buffer_track = -1;
} }
if (UFDCS->rawcmd == 1) if (fdc_state[FDC(drive)].rawcmd == 1)
UFDCS->rawcmd = 2; fdc_state[FDC(drive)].rawcmd = 2;
if (!(mode & FMODE_NDELAY)) { if (!(mode & FMODE_NDELAY)) {
if (mode & (FMODE_READ|FMODE_WRITE)) { if (mode & (FMODE_READ|FMODE_WRITE)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册