From patchwork Thu Sep 7 11:41:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 111887 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp680711qge; Thu, 7 Sep 2017 04:44:04 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6qLYY40ciiuB2s19rnhy8HlM2V08uOChaT0vt5GEvwso7A2a6F3emr/VxWkUaNrpcO6gVP X-Received: by 10.84.210.107 with SMTP id z98mr2662153plh.248.1504784644278; Thu, 07 Sep 2017 04:44:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504784644; cv=none; d=google.com; s=arc-20160816; b=x88B15/DDOia3bWI0dEypC6+ohTe08bXAP3bWjeQ11Y6mev+KHT5HDb0rEi0+6DZWc xTiymbtY33xrfFnKu9qMWAIwDRUM35a0fUXfj6wRuIsrfFq372vRLGvQr5DKaAzNLm1M 0C4orBA29//LepIHdnKOtGRnIp9zeMasgjLbBLYYnP4l39bb77WuevquXXa6zIrcDlRV L/WhcS9ReloWks3S3zzPkpcxZhRI3EeaZxMawf2QVM05qjfrijHaa1hjACbyfM6F7iik E7ZNTpxQa+vw/hgb3OR1Vvt7+PfvQfZuN09w9JUQfWzufGA3pMjhquLlBEKdonOajMpn Su1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=OU4buTi5rdQ/c0WP7ZgP3dT5In+tuzYJfeV5iVj+UCo=; b=MTc30EK5O92H4qsfPlfRIJn9lNK6WIg/ibO2GlDudkmSbW+NIROuTD2pErbJpe2d3g as1f0DvMXLsUivJNqa2KGKDftBGfQYxG9ZC1StjqUQtIfuhUn14Xkd1somvPVsxx9QfP UPEjyfSW4brwJvLrgxdXL8STnYsr/oljP+gMO6rP6a3lbUR9nNkPSeIZVRHewOxdVaKz DUxSffQ6tcqvesIsLxzO5iENVCsvfnXusakq7GVNW05coABSA3cTx2rbOzwWLSRXNLPJ qkQs2hurYhWX3Cak/UuRsJPXs+ZR2qU8UpK5gGBy4hPb2XLd5qvj2s87j5e/fttVPcd5 yC3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=WhSokaQN; 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 h3si1767510pld.23.2017.09.07.04.44.04; Thu, 07 Sep 2017 04:44:04 -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=@nifty.com header.s=dec2015msa header.b=WhSokaQN; 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 S1755298AbdIGLoB (ORCPT + 26 others); Thu, 7 Sep 2017 07:44:01 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:17197 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755169AbdIGLn5 (ORCPT ); Thu, 7 Sep 2017 07:43:57 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v87BgcP1021413; Thu, 7 Sep 2017 20:42:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v87BgcP1021413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1504784563; bh=OU4buTi5rdQ/c0WP7ZgP3dT5In+tuzYJfeV5iVj+UCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WhSokaQNO3bIHWV1r6Sgh9C5jT3rlmNPtq732gJAI8lqECv3KEA2s+ez5IClPyqxU er1OAGMhr+zDJBSzuc8S6ANcl/IsHk/rzVoD3UiL90lnIZpDo5jVJ5MkJZIHf/1te2 rzAnUU5hrrSShEzCCN2A8/olXGewvxsGh233vWcl7d98uHbKfkyq8KogRGGly7qgeM Ap422685/tkXeYmWoH6sbKabhZfztdzKZicM3T/EdukG8+GWRYZfa1SPPlFAoqP2mt 4a6WHq4TSDjChuyPluaLQJuoerO+Ct5KzKb6ibTQ+pA9er2D+QZULyc38CEX+xhJCp UCzDn6Y7rXg0w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Marc Zyngier , Thomas Gleixner , Linus Walleij , linux-gpio@vger.kernel.org, Rob Herring Cc: Jassi Brar , devicetree@vger.kernel.org, Jason Cooper , Masami Hiramatsu , David Daney , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v4 3/6] irqdomain: move IRQ_DOMAIN_NAME_ALLOCATED define to the original position Date: Thu, 7 Sep 2017 20:41:59 +0900 Message-Id: <1504784522-26841-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504784522-26841-1-git-send-email-yamada.masahiro@socionext.com> References: <1504784522-26841-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 6a6544e520ab ("genirq/irqdomain: Remove auto-recursive hierarchy support") not only deleted IRQ_DOMAIN_FLAG_AUTO_RECURSIVE, but also moved IRQ_DOMAIN_NAME_ALLOCATED up. Get it back to the original position to sort the enum by the bit shift. Signed-off-by: Masahiro Yamada --- Changes in v4: - Newly added include/linux/irqdomain.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 81e4889..31be32d 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -180,9 +180,6 @@ enum { /* Irq domain is hierarchical */ IRQ_DOMAIN_FLAG_HIERARCHY = (1 << 0), - /* Irq domain name was allocated in __irq_domain_add() */ - IRQ_DOMAIN_NAME_ALLOCATED = (1 << 6), - /* Irq domain is an IPI domain with virq per cpu */ IRQ_DOMAIN_FLAG_IPI_PER_CPU = (1 << 2), @@ -195,6 +192,9 @@ enum { /* Irq domain implements MSI remapping */ IRQ_DOMAIN_FLAG_MSI_REMAP = (1 << 5), + /* Irq domain name was allocated in __irq_domain_add() */ + IRQ_DOMAIN_NAME_ALLOCATED = (1 << 6), + /* * Flags starting from IRQ_DOMAIN_FLAG_NONCORE are reserved * for implementation specific purposes and ignored by the