Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 712e1de4 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

drivers/block/floppy.c: remove obfuscating CODE2SIZE macro 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ded2863d

drivers/block/floppy.c

+2 −3
Original line number Diff line number Diff line
@@ -2143,7 +2143,6 @@ static void format_interrupt(void) 
	cont->redo();

}



#define CODE2SIZE (ssize = ((1 << SIZECODE) + 3) >> 2)

#define FM_MODE(x, y) ((y) & ~(((x)->rate & 0x80) >> 1))

#define CT(x) ((x) | 0xc0)
@@ -2347,7 +2346,7 @@ static void rw_interrupt(void) 
		DRS->first_read_date = jiffies;



	nr_sectors = 0;

	CODE2SIZE;

	ssize = DIV_ROUND_UP(1 << SIZECODE, 4);



	if (ST1 & ST1_EOC)

		eoc = 1;
@@ -2647,7 +2646,7 @@ static int make_raw_rw_request(void) 
	raw_cmd->track = TRACK << STRETCH(_floppy);

	DR_SELECT = UNIT(current_drive) + PH_HEAD(_floppy, HEAD);

	GAP = _floppy->gap;

	CODE2SIZE;

	ssize = DIV_ROUND_UP(1 << SIZECODE, 4);

	SECT_PER_TRACK = _floppy->sect << 2 >> SIZECODE;

	SECTOR = ((fsector_t % _floppy->sect) << 2 >> SIZECODE) +

	    FD_SECTBASE(_floppy);