From patchwork Tue Aug 6 22:01:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 11079643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA95014E5 for ; Tue, 6 Aug 2019 22:01:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5A7E288C5 for ; Tue, 6 Aug 2019 22:01:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6C8A288D7; Tue, 6 Aug 2019 22:01:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56A71288C5 for ; Tue, 6 Aug 2019 22:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726810AbfHFWBl (ORCPT ); Tue, 6 Aug 2019 18:01:41 -0400 Received: from merlin.infradead.org ([205.233.59.134]:37282 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbfHFWBk (ORCPT ); Tue, 6 Aug 2019 18:01:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Date:Message-ID:Subject:From:To:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=j7p6yu1zYMTbxVSuHys2Gu71VuuXWlVpRq95oDO3UQQ=; b=ilSYD6l49w70pOQDzbwknDICh4 3RqLwV+7YZ9vt2Nt5TqtBej4kyBb8FDVExbPnQdqgC4iH233950VSfQqjNB1jqHAT9agQqcnKggn1 1Zj+e/DRtxdb9fGWC+wjeN1rKk4H27vzRfcqE9whwEC0CjcSTXaM2BoueIuSDq3lvqSjA2ECelyIM 2tlGQsuvq5kXjrSe3L1ZyRnls4OKCJRU4265dM8v5Z/85emI35hRc5RIi0SSunTggjT3Nwxi3s/Rc k6S8Qor94c5Scxoa/ndlHLKBrI3Fde3zRX9s/Br16ZzzMAAY/1bh6aw1QEk5NclR3ToDDtm079Kgw +sLJYttg==; Received: from [208.71.200.96] (helo=[172.16.195.104]) by merlin.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hv7WV-0007y4-6u; Tue, 06 Aug 2019 22:01:39 +0000 To: linux-media , LKML , Mauro Carvalho Chehab From: Randy Dunlap Subject: [PATCH] media/platform: fsl-viu.c: fix build for MICROBLAZE Message-ID: <6dad6b40-19b9-b2da-3549-0484f961ea2f@infradead.org> Date: Tue, 6 Aug 2019 15:01:36 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Randy Dunlap arch/microblaze/ defines out_be32() and in_be32(), so don't do that again in the driver source. Fixes these build warnings: ../drivers/media/platform/fsl-viu.c:36: warning: "out_be32" redefined ../arch/microblaze/include/asm/io.h:50: note: this is the location of the previous definition ../drivers/media/platform/fsl-viu.c:37: warning: "in_be32" redefined ../arch/microblaze/include/asm/io.h:53: note: this is the location of the previous definition Fixes: 29d750686331 ("media: fsl-viu: allow building it with COMPILE_TEST") Signed-off-by: Randy Dunlap Cc: Mauro Carvalho Chehab --- drivers/media/platform/fsl-viu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lnx-53-rc3.orig/drivers/media/platform/fsl-viu.c +++ lnx-53-rc3/drivers/media/platform/fsl-viu.c @@ -32,7 +32,7 @@ #define VIU_VERSION "0.5.1" /* Allow building this driver with COMPILE_TEST */ -#ifndef CONFIG_PPC +#if !defined(CONFIG_PPC) && !defined(CONFIG_MICROBLAZE) #define out_be32(v, a) iowrite32be(a, (void __iomem *)v) #define in_be32(a) ioread32be((void __iomem *)a) #endif