leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memstick: use sector_div instead of do_div

Browse Source 
do_div is the wrong way to divide a sector_t, as it is less efficient
when sector_t is 32-bit wide.  With the upcoming do_div optimizations,
the kernel starts warning about this:

  drivers/memstick/core/ms_block.c: In function 'msb_io_work':
  include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast

This changes the code to use sector_div instead, which always produces
optimal code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Arnd Bergmann 2016-01-20 15:02:15 -08:00 committed by Linus Torvalds
parent 8e99469ab0
commit 545b5e2ad4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/memstick/core/ms_block.c
View File

@ -1909,7 +1909,7 @@ static void msb_io_work(struct work_struct *work)
lba = blk_rq_pos(msb->req);
sector_div(lba, msb->page_size / 512);
page = do_div(lba, msb->pages_in_block);
page = sector_div(lba, msb->pages_in_block);
if (rq_data_dir(msb->req) == READ)
error = msb_do_read_request(msb, lba, page, sg,