diff options
author | Joe Perches <joe@perches.com> | 2010-03-10 18:21:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:31 -0500 |
commit | 712e1de43ed572886d6913a86eee5e73b7de4318 (patch) | |
tree | 584ed5a9e06a3e30fd9b03717411c60ea035a9bb /drivers/block | |
parent | ded2863d09208b27baa4a6ad95bb7e5539e48c05 (diff) |
drivers/block/floppy.c: remove obfuscating CODE2SIZE macro
Signed-off-by: Joe 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/floppy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 1fe5225a3829..0b659bb02ad4 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -2143,7 +2143,6 @@ static void format_interrupt(void) | |||
2143 | cont->redo(); | 2143 | cont->redo(); |
2144 | } | 2144 | } |
2145 | 2145 | ||
2146 | #define CODE2SIZE (ssize = ((1 << SIZECODE) + 3) >> 2) | ||
2147 | #define FM_MODE(x, y) ((y) & ~(((x)->rate & 0x80) >> 1)) | 2146 | #define FM_MODE(x, y) ((y) & ~(((x)->rate & 0x80) >> 1)) |
2148 | #define CT(x) ((x) | 0xc0) | 2147 | #define CT(x) ((x) | 0xc0) |
2149 | 2148 | ||
@@ -2347,7 +2346,7 @@ static void rw_interrupt(void) | |||
2347 | DRS->first_read_date = jiffies; | 2346 | DRS->first_read_date = jiffies; |
2348 | 2347 | ||
2349 | nr_sectors = 0; | 2348 | nr_sectors = 0; |
2350 | CODE2SIZE; | 2349 | ssize = DIV_ROUND_UP(1 << SIZECODE, 4); |
2351 | 2350 | ||
2352 | if (ST1 & ST1_EOC) | 2351 | if (ST1 & ST1_EOC) |
2353 | eoc = 1; | 2352 | eoc = 1; |
@@ -2647,7 +2646,7 @@ static int make_raw_rw_request(void) | |||
2647 | raw_cmd->track = TRACK << STRETCH(_floppy); | 2646 | raw_cmd->track = TRACK << STRETCH(_floppy); |
2648 | DR_SELECT = UNIT(current_drive) + PH_HEAD(_floppy, HEAD); | 2647 | DR_SELECT = UNIT(current_drive) + PH_HEAD(_floppy, HEAD); |
2649 | GAP = _floppy->gap; | 2648 | GAP = _floppy->gap; |
2650 | CODE2SIZE; | 2649 | ssize = DIV_ROUND_UP(1 << SIZECODE, 4); |
2651 | SECT_PER_TRACK = _floppy->sect << 2 >> SIZECODE; | 2650 | SECT_PER_TRACK = _floppy->sect << 2 >> SIZECODE; |
2652 | SECTOR = ((fsector_t % _floppy->sect) << 2 >> SIZECODE) + | 2651 | SECTOR = ((fsector_t % _floppy->sect) << 2 >> SIZECODE) + |
2653 | FD_SECTBASE(_floppy); | 2652 | FD_SECTBASE(_floppy); |