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

Commit 545b5e2a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

memstick: use sector_div instead of do_div 



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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e99469a

drivers/memstick/core/ms_block.c

+1 −1
Original line number Diff line number Diff line
@@ -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,