From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756974AbbKRVD0 (ORCPT ); Wed, 18 Nov 2015 16:03:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56745 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754683AbbKRVDY (ORCPT ); Wed, 18 Nov 2015 16:03:24 -0500 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, Felipe Balbi , linux-usb@vger.kernel.org, devel@driverdev.osuosl.org, Magnus Damm , Simon Horman Subject: [PATCH] staging/emxx_udc: fix 64-bit warnings Date: Wed, 18 Nov 2015 22:02:39 +0100 Message-ID: <4127718.gSaDyyMLEa@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:7VBRAPXdry22PQRJorTAVxwoD0kNs72bJCPhwE8RLViPVo8cVih up/nb1Vh5OhLGvaUJ6ROFDbdS3+BU2mQu6+roMbHjizl+ol3NxQN4Pjew1tPl6puT4QWjkp 0dSChvEnRAA3aHcoyIPM7r191sBGS9Ps6hIpJuOoRyKhys2iIUtcjtxmS5fKGkanGC/YwnV 3tHmJRSgr6Jo1SEcLjtVg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Y8zH1B9rLfA=:OLXCpQ930KNntnSvKPlATb OrP7bmnFJvYXdMlLIOItS8FfmqvhF4oHs2INHFyQ1Y5+ONFIvu2ECYrr7ky0QaBN/wK4DOT+m 4PEcmNNCMsRoVzWtqe8ZAaDmQlulA0f0dZieSNf0R9EpKF4CrOx6HbrAZm3+TwgrYAePUw5U5 K9rN6J68X/ck3PteNzXPZOZuMiCeXYB+FEg/Oa2CvixEgbVlOmGODoceKl04f481yVpewVNY5 EYoKcJ56BW2xsfZ+LeQ+VbS9ftKoq11kpi2ZLPGd5ZogODrd4gsDsShTks0WPFJzsGQwCYu55 dR70dPsbSziCErlg+F/U48qQ42rO0zUUA6v/5GjbuB7D1MvGxy/2V7zZm4bUWijppIHuqg+Bg 8piPsNxLgz9cSddvu9lfZt7myqgHyaRU0T8J/J0NR5hWmxrm+VZzqT7Ax4qC5RVBxdEskzacr KMTk97KQC0AWQajMx0Xgpq8YLq3OmLCG/2hV7CaEeQvuHKv06U2AFadX6Eeam2trxjA6OHG3I EIw6C3vsUVnHtUAhfsGpdpDtuXJt/KLv/VhchOBmglfX9b89A24tVzCh5xtz31+EQ5ruEttbi CoFS/mm112abh5Ndi8mSbrONwlyseMPjJKATGQIbbDYZJLTDVPOJ2yQFoPSyK3TqMOb+jx5ZD InDMUAA4pfJPOiw84x9TYzYMzneEDlSpNq9c/OZKDlluZPf6MZmxDSGSe2GaJRygEEK7XqJIH y/PbN7cmT6D377xw Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ARCH_SHMOBILE is coming to arm64, which creates new warnings in allmodconfig: drivers/staging/emxx_udc/emxx_udc.c: In function '_nbu2ss_out_dma': drivers/staging/emxx_udc/emxx_udc.c:843:45: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] _nbu2ss_writel(&preg->EP_DCR[num].EP_TADR, (u32)pBuffer); This is clearly a mistake from confusing a dma_addr_t with a pointer, so the fix is to use the correct types in two places. The third warning of this kind is a check for an unaligned pointer, which should be done by casting the pointer to uintptr_t, not int. Signed-off-by: Arnd Bergmann diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index 4e6c16af40fc..c168845cbb91 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -823,7 +823,7 @@ static int _nbu2ss_out_dma( u32 length ) { - u8 *pBuffer; + dma_addr_t pBuffer; u32 mpkt; u32 lmpkt; u32 dmacnt; @@ -836,7 +836,7 @@ static int _nbu2ss_out_dma( return 1; /* DMA is forwarded */ req->dma_flag = TRUE; - pBuffer = (u8 *)req->req.dma; + pBuffer = req->req.dma; pBuffer += req->req.actual; /* DMA Address */ @@ -1034,7 +1034,7 @@ static int _nbu2ss_in_dma( u32 length ) { - u8 *pBuffer; + dma_addr_t pBuffer; u32 mpkt; /* MaxPacketSize */ u32 lmpkt; /* Last Packet Data Size */ u32 dmacnt; /* IN Data Size */ @@ -1080,7 +1080,7 @@ static int _nbu2ss_in_dma( _nbu2ss_writel(&preg->EP_DCR[num].EP_DCR2, data); /* Address setting */ - pBuffer = (u8 *)req->req.dma; + pBuffer = req->req.dma; pBuffer += req->req.actual; _nbu2ss_writel(&preg->EP_DCR[num].EP_TADR, (u32)pBuffer); @@ -2728,7 +2728,7 @@ static int nbu2ss_ep_queue( spin_lock_irqsave(&udc->lock, flags); #ifdef USE_DMA - if ((u32)req->req.buf & 0x3) + if ((uintptr_t)req->req.buf & 0x3) req->unaligned = TRUE; else req->unaligned = FALSE;