From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9006BC433F5 for ; Mon, 4 Oct 2021 07:56:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 74C7561381 for ; Mon, 4 Oct 2021 07:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230430AbhJDH6A (ORCPT ); Mon, 4 Oct 2021 03:58:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbhJDH56 (ORCPT ); Mon, 4 Oct 2021 03:57:58 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D188C061746 for ; Mon, 4 Oct 2021 00:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=sEM3BPdzVY3/dR2zcinwoXa/ww1WSluj3d/TakcR2J4=; b=WfWtrFvRHlsqao5fP4ENEPXYjD zzXOSJ5850uW0KOcDbeOdzPvIJtU9g4MGLFMVLA9SBFWlRGHmby1sKnBk05IkaP1VTtLwuAMBnEXS g2sFXgfSkH7WE9Xh0qQHwu6ncE9j7RmHdIK0gegMskrZQFlOivZWFr1d8ruWLPMhX6k1vSzgJjGAQ ZkD6H+NAbdscLMQ1feCeVth32OgFYz+uef+MG6tCnZBcqsqm6rexooHvvIKaNdZLBRq6Wlv2b9Bk+ U0v/xTfJQPtSEGJGuWSdoPjRNuDFi/0oGCBZKFcfuH/tOrfc7g/CQdWFEIHQNeziXRRbcax5qxddf 96v2VHew==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXIpV-005YAx-Mz; Mon, 04 Oct 2021 07:56:09 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Dinh Nguyen Subject: [RFC PATCH] NIOS2: irqflags: rename a redefined register name Date: Mon, 4 Oct 2021 00:56:06 -0700 Message-Id: <20211004075606.6229-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro with the name "CTL_STATUS". Change the one in arch/nios2/ to be "CTL_FSTATUS" (flags status) to eliminate the build warning. In file included from ../drivers/mmc/host/tmio_mmc.c:22: drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined 31 | #define CTL_STATUS 0x1c arch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition 14 | #define CTL_STATUS 0 Fixes: b31ebd8055ea ("nios2: Nios2 registers") Signed-off-by: Randy Dunlap Cc: Dinh Nguyen --- arch/nios2/include/asm/irqflags.h | 4 ++-- arch/nios2/include/asm/registers.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- linux-next-20211001.orig/arch/nios2/include/asm/irqflags.h +++ linux-next-20211001/arch/nios2/include/asm/irqflags.h @@ -9,7 +9,7 @@ static inline unsigned long arch_local_save_flags(void) { - return RDCTL(CTL_STATUS); + return RDCTL(CTL_FSTATUS); } /* @@ -18,7 +18,7 @@ static inline unsigned long arch_local_s */ static inline void arch_local_irq_restore(unsigned long flags) { - WRCTL(CTL_STATUS, flags); + WRCTL(CTL_FSTATUS, flags); } static inline void arch_local_irq_disable(void) --- linux-next-20211001.orig/arch/nios2/include/asm/registers.h +++ linux-next-20211001/arch/nios2/include/asm/registers.h @@ -11,7 +11,7 @@ #endif /* control register numbers */ -#define CTL_STATUS 0 +#define CTL_FSTATUS 0 #define CTL_ESTATUS 1 #define CTL_BSTATUS 2 #define CTL_IENABLE 3