Commit 491e5b17 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'floppy-for-5.14' of https://github.com/evdenis/linux-floppy into for-5.14/drivers 

Pull floppy fixes from Denis:

"Floppy patches for 5.14

 Two oneliners to fix clang warnings:
 - -Wimplicit-fallthrough warning fix from Gustavo A. R. Silva.
 - Redundant assignment warning fix from Jiapeng Chong.

 No semantic and behavioural changes."

* tag 'floppy-for-5.14' of https://github.com/evdenis/linux-floppy:
  floppy: Fix fall-through warning for Clang
  floppy: cleanup: remove redundant assignment to nr_sectors
parents d07f3b08 2c9bdf6e

drivers/block/floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -2123,6 +2123,7 @@ static void format_interrupt(void) 
	switch (interpret_errors()) {

	case 1:

		cont->error();

		break;

	case 2:

		break;

	case 0:
@@ -2330,7 +2331,6 @@ static void rw_interrupt(void) 
	if (!drive_state[current_drive].first_read_date)

		drive_state[current_drive].first_read_date = jiffies;



	nr_sectors = 0;

	ssize = DIV_ROUND_UP(1 << raw_cmd->cmd[SIZECODE], 4);



	if (reply_buffer[ST1] & ST1_EOC)