Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp70518ybp; Thu, 3 Oct 2019 10:18:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUNYqrAcIuneWwj3D4ZOf9B7RsJEs5VNs9MjQJevuTS3ey87WxgQuHbyx2UgCbbzuBku+L X-Received: by 2002:a17:907:215a:: with SMTP id rk26mr8574987ejb.49.1570123095720; Thu, 03 Oct 2019 10:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570123095; cv=none; d=google.com; s=arc-20160816; b=El8Wx/iEapPBIixJ2qGza/UTW8PZVPyz2tMXCbwntT8Zz/IZYP4PjLW/VrU0ejIE4y Heo1E38xHoND5VyVu5muDlOppGwmb3n+ba8YxkSfKm7RksDLRT0VIFp3Od9837VaHnQp cxOryDE3mETxYQJBCN2BljHq5X1Iteme2YyqOxCCPceevJ8p9XogWDCJC1CqIAlTw/Na tgktsIe1fBW8exODUw1dnOJzGOEx0qg8NpN978qaGQD3DV6jo9/wwM8PsJuKGofHVOfK pv4515KusLDU5fNH14EHaJdK8Lbe269+JMc9mu/+2Od5ZZtv/g+m+46pIfHrRhKtKBWE /ERQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JH4/SXPFcexhTXjW8k04jkClN1moKJBzqXq5BQY9M/A=; b=DHPKIqQyBR+rqmOuoP4fFghxPgXOuwdJWtgI/ajhj8Gd376kpQ1Ou48jM8E5qaM3Zl yvzFBbkhLGz/g9gPLvmC0u1tVgfT1AVcWohDjRFS+gp1J7lKgjHV1DNPEdLzH0jqneVe d+Dg30m1x+a8IeUBBAVqImyhsTrCzp6r/mJ9Wzfe3AG8H47/KZzY1z7K/76kEQnm8XDV Eskox7U0rxgBu2uJKLeA2JRbznCOngUMKQh6rHQYfmdaNHEYn7dqLYLRpyUqBE6WMdgu qVC/xCxJh+gseyYZzPakHbje3x9QEdqwiGEAnP2D9NyxaSxHpLXNY6r8CIBQnF4DoNb0 sDvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BBM8rQuz; 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 d2si1392074ejk.301.2019.10.03.10.17.51; Thu, 03 Oct 2019 10:18:15 -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; dkim=pass header.i=@kernel.org header.s=default header.b=BBM8rQuz; 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 S2390677AbfJCQ1t (ORCPT + 99 others); Thu, 3 Oct 2019 12:27:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:59898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391321AbfJCQ1q (ORCPT ); Thu, 3 Oct 2019 12:27:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 77A3E21783; Thu, 3 Oct 2019 16:27:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120066; bh=iPazQ00aOuuilt+GzDQbr9bRbIVeHkRFhHoRkii1JTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BBM8rQuzSVkXUKFjULwrQMdXupW1Ev190+jz9k85MUMMqMoQyvfsG6UkJIKYAabaf SJXDpawyxM6y4R3oAbOyrZLRMJTRigHXPmKjQrM3KwBvSstX5vxU9eJl58WyVOHTg5 UituwxUnlN8Ah/H46ylL4gzpf6rUFmdTOlrZJdRs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.2 077/313] media: media/platform: fsl-viu.c: fix build for MICROBLAZE Date: Thu, 3 Oct 2019 17:50:55 +0200 Message-Id: <20191003154540.433851084@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit 6898dd580a045341f844862ceb775144156ec1af ] 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/fsl-viu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index 691be788e38b3..b74e4f50d7d9f 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/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 -- 2.20.1