From patchwork Wed Jan 10 16:42:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 124118 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5493241qgn; Wed, 10 Jan 2018 08:43:09 -0800 (PST) X-Google-Smtp-Source: ACJfBosJNM0R2Q6n72+DkygadHfg1cFtqGbM5l4JUWYa2C7CCHC5zwjpQEEMTTOW1xlGC+rZXs05 X-Received: by 10.101.80.139 with SMTP id r11mr15421241pgp.383.1515602589873; Wed, 10 Jan 2018 08:43:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515602589; cv=none; d=google.com; s=arc-20160816; b=uHQgrwt4oYQXul7PkpAhx0mRyjp9HWsE9kLfXQWISKIEUNqnoubftIe1bWr78R/Rhp YiRG7wIC/4HkDYt7+TBBpHvL8MTvBz0pkKL1LgPmUcsE2ZLjrFEPyQhMYSXzK6o0F3yI 9rrsiMDfdom/reErvr/d9tEIaBnhMRXW5yTF5trhkR9xsR2S9cQtFkO7TYYVAiOjrXvO y3Xci3AluPntnHWt+NWtRNMVxJ3HcCn4o0O+bsWEKp69qUMMnevGyhyxLA11LM1Q2SHh jVT5rCce8NDPqbTPsZ8LIRS46tdvTAG/D0npVmfpy2lZ5F7uSpnwznyiah09QA4vcVPF R5Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=n8rDwdt0dwYGWtx7NrXOrL+RYoOGw5hwejWGOwkhURY=; b=OirGFjdAGW4BaIwWIl7W1RYtIVbyfMJ3PEz7a8ngjRQNCm5IHZelwAB0tHOLnd3vEp mF428+Uhi1z/mZfyMg9lWSqxdvuaDhZfN3OKgXgqUbmZAp1sEvH60iX+VL/dBZp+Ufc+ 0CCVvyC9jhJmOtoTDpoJTZ6vtsbmAhBjPOIV4HkAIJ+z2OehdNaPS/KCryayKj39lt2S ACOIMMnZKwNL2yAaLfJodZwGPznCfSoEr1R4YAEXTLcziMLPvQ/XARYMgL2r4BaiJ2Fy Q0UyIU9izp/T1AdVgdRjf75hwOP6EXI/9osD16o/ax76VaIuvLqEg/Fxgs03OuWlKO05 QbXA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h14si11984836pfj.360.2018.01.10.08.43.09; Wed, 10 Jan 2018 08:43:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966372AbeAJQnD (ORCPT + 28 others); 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 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MBFvV-1ehKLx0wkP-00AGZY; Wed, 10 Jan 2018 17:42:52 +0100 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 Signed-off-by: Stephen Hemminger 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;