From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760846AbbKTQpZ (ORCPT ); Fri, 20 Nov 2015 11:45:25 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:58883 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760758AbbKTQpU (ORCPT ); Fri, 20 Nov 2015 11:45:20 -0500 From: Arnd Bergmann To: Maxim Levitsky Cc: nico@fluxnic.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] memstick: use sector_div instead of do_div Date: Fri, 20 Nov 2015 17:43:44 +0100 Message-ID: <7721365.qIlei5Urfx@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:TKs2B4SAHn2UZ8bF1bqtBqHKQBzWCUO/dhyRBpCUwUqG8TeQFht zc98nfUMHLO730mSX8uhqZcdMGMRvMh4yUpAsuwr2iX3eDs1cibBe5ajdsAJ/9JSdlx2Fo2 Lynh1v/v2lxOaGoG/TTdyeSRmAtCjiLD2xJBdl+ZNy6lqeNLH3OUIpS2hF29bUA+I3pBhqi kTJXQHPpl0lo1qKPeNXOg== X-UI-Out-Filterresults: notjunk:1;V01:K0:df+QKBFLpy8=:Rrj6tSbfGyjlxKX2AJi5b2 lSc0m2DA4FUFqHOoxpvZlwz66qjYW4iE2dfSwbaLtMfM+rhvnmQ3uAJ/ra+cL/SKANRd44qyo bGtt0MrDyQ0OFbAwNCtc2ttLsGCtGobzSvpahqyTxHcF3pBsaN0msIoCr1TQ7842d1fLirZae YC6NqQYRNvErBzrlreQ2+qp4RURvUhN0ft8Crhaknbs3ihABk+6pTT4O2rLB21h4Sqj0GDwWS Dh/WhQ7yEm1Fsm7VThn1aAI3LM5HumaCJMunOCbVOQ/G1Y5ZVs9SnF2zr5XZpj/aKGiGfVJqT Pn9sjmQv1Amj1JdoJxlpS6gF8WcMsOaWDeOSGonEV4kW0dSFjNPdOL428UEn++qeGQhQNVsqn n42n3bSOjMimH/y6Qxf/iZv9hu8T0FrLEYFw1QQcbk7ciI1tjBewsVm9gwta6rqNaQyf53nwX k/hl5xN/JxTM3i2gO48axApMgnPmIt+1Z9tWVO60aun/Skq+rLVbW1g3IfRb7pOPAG6VqEIRc zMz8LK1UORE8PQfxnSlky1Mp8E8NNl3lWSz3lMyDStrY0w4sNP/JjcKFSBY2W7Xpbs62mPU8j v6u4YPNVlNr+NVoR6vTTdjuoR3xwVOWCKOzd+SSRC+kl5l+hU3ih7eykzTFRMT3a5Wd+HTnLB a4ccFMXDcgZ+kpLdcuKzmHOexIIH1PzEo80Hw2PuRdSc5pajnfTLHSogRLwdjE6LTUe9FiiZH oRv3xbGtEOP8imsO Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 24f2f8473dee..84abf9d3c24e 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -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,