From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754612AbdBGNAQ (ORCPT ); Tue, 7 Feb 2017 08:00:16 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:54022 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754116AbdBGNAN (ORCPT ); Tue, 7 Feb 2017 08:00:13 -0500 From: Arnd Bergmann To: Adaptec OEM Raid Solutions , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Johannes Thumshirn , Raghava Aditya Renukunta , Dave Carroll , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: aacraid: avoid open-coded upper_32_bits Date: Tue, 7 Feb 2017 13:59:30 +0100 Message-Id: <20170207125948.490095-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:9pg4jrelD4vvyzzZTTgXzQp7bgGm1bYMdAOA4NgsbkUSWnWDADR iQsAd2ZFVt3xjLHLDEP7p9StgoZsiSMYGs0cO5DoqrsCYcpHHGT6Zh2GjkOg5F26VXSvoz/ 4jiDgvDTVD3ylfkSYD+hDC0qOoFF0vg1GGZ78cRECJys/zGIjCmymyZt85MIPujzJhouH53 5pkauCAxOA6yQzkCiXoCw== X-UI-Out-Filterresults: notjunk:1;V01:K0:pdW+DdxKFZE=:Qk8tLfAJmpMdphGY9/frZs 4qdX+4Orf6DER+F0JPjWL8nCve2KYfm32VEIysdA5sJ8Y3SA++ugvyLG10Rqbb7ZtF9JMGvcO HVx3dp9HYxHRPw9d9JIh9cw+wCvK64GM9vFTqXEtVpg+fxbqEWrU1zGLktkRAVAHaxkEsGoXS UiMg8BnZA4aQfU6RbQy4uccy0SJgls0XNWH/qstvlKreqMsLkoUmeLAZ+kgXCM1wuseNSHh+k zB0bcuEaBUI07KTyOWvIcoFepoXF+R9pEunRfU3hx67ZHoYOLhvcnpwwa2k4gNMyR2FLtDg1m JsHxJT47z9ZDKg+I1kEUaIf9BfyK90HqhAx02fCBufeGLzEMakG8nCSecmEu4+K4eFfijS6Kq vxLyKitvOhHyi9S6e31ETdR6RQu1wl1D9Wzyy15DW2H6YzP3cc/vmqPhU6xEdruMi1ciFvOLV J3TUVrRHZTG3B+srA8cAHB+bI+m0v36htaBPU4FHqvfe/gjZVuZ/bkt7erVlAWJobN8ptiais g3ZuSb+T74EjNUoATy8wXDVZrtuBgfjfZpm/ymC6VIO5ySatcvRMfXW+bin6XohP2XSI5rXkx 1hCXhOsIYfbdxNnZjTJkjEo1fRe7pSqsT2Gz4GFPezKdMJ8RBVjHjfWeFm8rngB2hnKpE8ayr OhLsjOseGQgcGHw4wFyrARZADXbQRK9g2HtgGhrlLl1XJJxdFQRPzwxdY1cB+KJ3dIFw= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Shifting a dma_addr_t right by 32 bits causes a compile-time warning when that type is only 32 bit wide: drivers/scsi/aacraid/src.c: In function 'aac_src_start_adapter': drivers/scsi/aacraid/src.c:414:29: error: right shift count >= width of type [-Werror=shift-count-overflow] This changes the driver to use the predefined macros consistently, including one correct but open-coded upper_32_bits() instance. Fixes: d1ef4da8487f ("scsi: aacraid: added support for init_struct_8") Fixes: 423400e64d37 ("scsi: aacraid: Include HBA direct interface") Signed-off-by: Arnd Bergmann --- drivers/scsi/aacraid/src.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c index 46976a3b6952..8e4e2ddbafd7 100644 --- a/drivers/scsi/aacraid/src.c +++ b/drivers/scsi/aacraid/src.c @@ -410,8 +410,8 @@ static void aac_src_start_adapter(struct aac_dev *dev) if (dev->comm_interface == AAC_COMM_MESSAGE_TYPE3) { init->r8.host_elapsed_seconds = cpu_to_le32(get_seconds()); src_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, - (u32)(ulong)dev->init_pa, - (u32)((ulong)dev->init_pa>>32), + lower_32_bits(dev->init_pa), + upper_32_bits(dev->init_pa), sizeof(struct _r8) + (AAC_MAX_HRRQ - 1) * sizeof(struct _rrq), 0, 0, 0, NULL, NULL, NULL, NULL, NULL); @@ -563,7 +563,7 @@ static int aac_src_deliver_message(struct fib *fib) fib->hw_fib_va->header.SenderFibAddress = cpu_to_le32((u32)address); fib->hw_fib_va->header.u.TimeStamp = 0; - WARN_ON(((u32)(((address) >> 16) >> 16)) != 0L); + WARN_ON(upper_32_bits(address) != 0L); } else { /* Calculate the amount to the fibsize bits */ fibsize = (sizeof(struct aac_fib_xporthdr) + -- 2.9.0