From patchwork Mon Mar 14 14:07:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102600 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp57359lbc; Mon, 14 Mar 2016 07:08:11 -0700 (PDT) X-Received: by 10.67.8.100 with SMTP id dj4mr38474614pad.88.1457964491116; Mon, 14 Mar 2016 07:08:11 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ua9si23308937pab.25.2016.03.14.07.08.10; Mon, 14 Mar 2016 07:08:11 -0700 (PDT) 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 S934215AbcCNOID (ORCPT + 31 others); Mon, 14 Mar 2016 10:08:03 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:49459 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932102AbcCNOIA (ORCPT ); Mon, 14 Mar 2016 10:08:00 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0MMpSB-1akiTS2hpf-008XWB; Mon, 14 Mar 2016 15:07:25 +0100 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Felix Fietkau , John Crispin , Matthias Brugger , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] net: mediatek: use dma_addr_t correctly Date: Mon, 14 Mar 2016 15:07:10 +0100 Message-Id: <1457964435-2945038-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:ac03h4tPGnMpk8wS+8lUZmKFj1JmCO2q1zU8OpUSaII7bR3ftXi ldHe8i1pnOtog47QCQ4lnR6wqwgchQdsxX9bgx+OD5iYvyocqPTjQKe+D6csrUfufqcLkpp bD2r3bLzPYbbDymo/cc30vVRuvrpLidvJAa/J4Vha2kfvzAYUg5H7mIyjmvprTN3gFFYINr h67fquYv1Y/88MuL9704A== X-UI-Out-Filterresults: notjunk:1; V01:K0:RKQCA+woAZg=:lXX7clatdCXJpdtynymTnF QW1NbscFHVevhtjcBJDvVpe2xapPsutKdD+SUXjCAoDw8yk7oac9bATIp5IfzR9MfcYyEHoRT D2NNyRY9ehvycqHDWK4S4RSeiOFgZlrU7HK89NltmjS++mxXvk6/39QPX3qthjLb5dVVazP6Z hKBX8MzOPL88Gh3j5sg4FnoPXbJPsWTlTPf0xYL9GV8cDGVjzW3POv/Nq8uZ/JN3XXclik/Os vDa1nYtlQqHIp5+vfUjrlWlAWlytn3rP/ZJqLYvpAjOCgzPu7XAitn/YR9Wb8CuyOSUc71ccr ZKuKgLxQXkN7fM81fAwZZSG+732hlWsWUpIMlIYxcwO+WPRbVSs1W0PJ3bOxGJtUDIyUFbaGc 84H+W2pGY98cmyYINN8C9nktDXIGJQnzONQDqhVvn+D0J3iQBHHhtM35+umLYyom/OJ74w/rx 52nb0KmHhn1RySGxDgy1hjPWOCNTj+PSb+0u++CMYT5vbzcqCvAZ0g+Y0K5VPKIXXN/y3He5w BO3rOFsMXswjnev1TOxY4QzopJAJXMqs8HCZRYx/AMgnJc4Z7RTdOVJc8nUie3PMhquIyi3IB 6lC47IX2uag/M8lyzfUcSBY5xluh5AqdHuzvSZJXOUfcrBPPGgUm4fuSm+3a9WKQO7DOU7Ffp te1elYKH+Pg8wrFbVktatGcLxImbN0w9MbOoQQhfYrWpSeBxAASfpKeAM6zf/rjVW2t4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dma_alloc_coherent() expects a dma_addr_t pointer as its argument, not an 'unsigned int', and gcc correctly warns about broken code in the mtk_init_fq_dma function: drivers/net/ethernet/mediatek/mtk_eth_soc.c: In function 'mtk_init_fq_dma': drivers/net/ethernet/mediatek/mtk_eth_soc.c:463:13: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] This changes the type of the local variable to dma_addr_t. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index ba3afa5d4640..3e42204adfe5 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -453,7 +453,7 @@ static inline void mtk_rx_get_desc(struct mtk_rx_dma *rxd, /* the qdma core needs scratch memory to be setup */ static int mtk_init_fq_dma(struct mtk_eth *eth) { - unsigned int phy_ring_head, phy_ring_tail; + dma_addr_t phy_ring_head, phy_ring_tail; int cnt = MTK_DMA_SIZE; dma_addr_t dma_addr; int i;