renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code

floppy: cleanup: make twaddle() not rely on current_{fdc,drive} anymore

Browse Source 
Now the fdc and drive are passed in argument so that the function does
not use current_fdc nor current_drive anymore.

Link: https://lore.kernel.org/r/20200331094054.24441-10-w@1wt.eu
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>
This commit is contained in:
Willy Tarreau 2020-03-31 11:40:40 +02:00 committed by Denis Efremov
parent 38ede90831
commit c1f710b5fe
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/block/floppy.c
View File

@ -827,14 +827,14 @@ static int set_dor(int fdc, char mask, char data)
return olddor;
}
static void twaddle(void)
static void twaddle(int fdc, int drive)
{
if (drive_params[current_drive].select_delay)
if (drive_params[drive].select_delay)
return;
fdc_outb(fdc_state[current_fdc].dor & ~(0x10 << UNIT(current_drive)),
current_fdc, FD_DOR);
fdc_outb(fdc_state[current_fdc].dor, current_fdc, FD_DOR);
drive_state[current_drive].select_date = jiffies;
fdc_outb(fdc_state[fdc].dor & ~(0x10 << UNIT(drive)),
fdc, FD_DOR);
fdc_outb(fdc_state[fdc].dor, fdc, FD_DOR);
drive_state[drive].select_date = jiffies;
}
/*
@ -1934,7 +1934,7 @@ static void floppy_ready(void)
"calling disk change from floppy_ready\n");
if (!(raw_cmd->flags & FD_RAW_NO_MOTOR) &&
disk_change(current_drive) && !drive_params[current_drive].select_delay)
twaddle(); /* this clears the dcl on certain
twaddle(current_fdc, current_drive); /* this clears the dcl on certain
* drive/controller combinations */
#ifdef fd_chose_dma_mode
@ -2904,7 +2904,7 @@ do_request:
}
if (test_bit(FD_NEED_TWADDLE_BIT, &drive_state[current_drive].flags))
twaddle();
twaddle(current_fdc, current_drive);
schedule_bh(floppy_start);
debugt(__func__, "queue fd request");
return;
@ -3610,7 +3610,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
case FDTWADDLE:
if (lock_fdc(drive))
return -EINTR;
twaddle();
twaddle(current_fdc, current_drive);
process_fd_request();
return 0;
default: