From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966372AbeAJQnD (ORCPT + 1 other); Wed, 10 Jan 2018 11:43:03 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:49177 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965569AbeAJQm7 (ORCPT ); Wed, 10 Jan 2018 11:42:59 -0500 From: Arnd Bergmann To: "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Greg Kroah-Hartman Cc: Arnd Bergmann , devel@linuxdriverproject.org, linux-kernel@vger.kernel.org Subject: [PATCH] uio_hv_generic: fix type mismatch warnings Date: Wed, 10 Jan 2018 17:42:38 +0100 Message-Id: <20180110164250.1103858-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:zYCOw7WFfld0N6frrWJ0GFUgj/bvvJKqj0kKg4qnSVq8z+DMfYE XoqRIWy2bxnFsqGTZQsKTRfvh11oXjLVT8MiQ5i6QeHoAD+yxZhQK+90ut0ftvoBIjNDbtl /48hsUTnTEjDqjbw5KMbB/mJrc7ccds2K8YNg3N6r7r+pn8Ta25SKzQ96UxC5iLGm1Stssh TWRKPYjLvAs7iPU6z9y2Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:VsE6oLo1Zlg=:BWC7C1IPDv28ZFuiR3J5uU nq5xGfS5eCB778HmJZUTb2BCplRwC1lzyvl8rtSCzQ7/T9/HsmSP4GfQHvUg+pcK4QPRY6poL GD9NpZF/bNQDHai7Igmu0E2mtaWlolJYljGKQ8jX1pAZVCt9onAq0+1RLPZDWJJ7Ve9gQtSHD /wIA/Ln6tqAiTWRU+a1cfCaIiFnaI42aKtbkNbs2pk0qPhAhsPy3VKGoclH3zSCbPYwQJnbJJ odsNGsz2MDBrfWUBC/OsJ11lJ6DrNG31jJyhpbL9Z1s1mhIfww/nhunwJbhu00LtRCoVgW0nL fB4K8A/03TQXUw+GGsVbnFn01JWAC68rSVsfcM9fsoj86zw6MQAWR5rnFiN6p5ai6cMsI+HkQ Reapu/s6cM8LFjI2wCmzqYXvgnuKGT4/KYmIwZYuSZnkqzgntfIlg3AO6oZV5e/0Y1FtH8ePO aDCPpbYl5/hVAH9i57R1/t90qYnyXBSwnIhiqp/5Y8182HNO9r4/nwZGek+N8FlLIQOoz4YKl JuqSX1UN3z8Eh2NQGzZIEvND/1PpdqsuD7ty9BFCpv/i+rGqb5vyDGmoWQ14NfJgHRo5iBtBK jaEljiIHY3KZTD5Sbw0ZweNYTEP7/t741qmeJPw79HIgVUMBOQlYXhx1VErXZiHBVRnqNA9cQ LD3RP5HOWFGRMQTtDdAwtdmQDCznrrWNSISL7vGtZ4MYr8n6xDJdH2LpWpOLwPy/coZsyrfe0 yTwllkM8vcOsLueqgi3RjS1D8jyYM34UTmJboA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: I moved the virt_to_phys() conversion into hv_uio_probe() as part of a warning fix. Stephen's cleanup to remove the private mmap() function seems reasonable, but part of it reverted the change that I did to hide the warnings, so they are back now: drivers/uio/uio_hv_generic.c: In function 'hv_uio_probe': drivers/uio/uio_hv_generic.c:123:5: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] drivers/uio/uio_hv_generic.c:130:5: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] drivers/uio/uio_hv_generic.c:136:5: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] The type mismatch is now the result of the uio_mmap() definition, and the best way I see from here is to shut them up with a uintptr_t cast. Fixes: 9c40546c012c ("uio_hv_generic: use standard mmap for resources") Signed-off-by: Arnd Bergmann --- drivers/uio/uio_hv_generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c index a0c4c07a907f..c740984506f7 100644 --- a/drivers/uio/uio_hv_generic.c +++ b/drivers/uio/uio_hv_generic.c @@ -120,20 +120,20 @@ hv_uio_probe(struct hv_device *dev, /* mem resources */ pdata->info.mem[TXRX_RING_MAP].name = "txrx_rings"; pdata->info.mem[TXRX_RING_MAP].addr - = (phys_addr_t)dev->channel->ringbuffer_pages; + = (uintptr_t)dev->channel->ringbuffer_pages; pdata->info.mem[TXRX_RING_MAP].size = dev->channel->ringbuffer_pagecount << PAGE_SHIFT; pdata->info.mem[TXRX_RING_MAP].memtype = UIO_MEM_LOGICAL; pdata->info.mem[INT_PAGE_MAP].name = "int_page"; pdata->info.mem[INT_PAGE_MAP].addr - = (phys_addr_t)vmbus_connection.int_page; + = (uintptr_t)vmbus_connection.int_page; pdata->info.mem[INT_PAGE_MAP].size = PAGE_SIZE; pdata->info.mem[INT_PAGE_MAP].memtype = UIO_MEM_LOGICAL; pdata->info.mem[MON_PAGE_MAP].name = "monitor_page"; pdata->info.mem[MON_PAGE_MAP].addr - = (phys_addr_t)vmbus_connection.monitor_pages[1]; + = (uintptr_t)vmbus_connection.monitor_pages[1]; pdata->info.mem[MON_PAGE_MAP].size = PAGE_SIZE; pdata->info.mem[MON_PAGE_MAP].memtype = UIO_MEM_LOGICAL; -- 2.9.0