Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2575088pxj; Mon, 10 May 2021 06:14:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUszM5JgMPezfsBzaqYp34hFjBaFM7xYTtS4P3JF3/rsVZgs/hw6Yki35mVwhmLVDgqmQi X-Received: by 2002:a05:6402:40d6:: with SMTP id z22mr29585164edb.125.1620652453093; Mon, 10 May 2021 06:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620652453; cv=none; d=google.com; s=arc-20160816; b=XyOVZAfFIvKQ71p9ouhTxm9KSCqdDoaLWkgg5XUspTvhqjV3FvYYN+ZWsjfwAUIdG3 SEhR5QBdy5tK7vs0YoOfxB3TzVoRVOhNVplZSeHPU4qoibkBtzLYssVI+AzJ2Y+MiNaZ Hb5WrKjai/j5rFdLGnrSt+O612+PcZa6Mdd1em/RV01oyieIYpgOU1RxVXurEJks/4Di nLXetl/StKFuTM4AFfay2YYO2/pW1izFEw2OO1USKx5SMmp+RYrZf+xM9WGcW23oc89B c/PBgBJNmEr+FdJakk52HKXpnKxwtOJVp0TQq8InrfWWt4e0HI9EmZ2cGO28lqSUPlRu coZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=HIC1NtjNK0JwWg99ieJKDr6gUjq07a35/ZCUjXbH7qE=; b=qTHkIU0IlhVHsAEdsoUh8xAQzb3MBhI00jAdmsaSaTCDzw4+mf/75j+dljtV+tDCAR F5EU6nR2fgl0/OvH1hRTaQk5QWaj0u/qmV3hKL0/a44R4ejb0RoWDtU+mtzJ1j6bUqS4 Y2kjhj/xX1fKJWgjNjZHDM8Nw7DIluJjRzQnyS6iqs1OxfnLpLg+phRPSLal8LJgDA+u FlaRlTBoYep4pvnIb7vniW/GbJHzegEmDw7mlvwOy06lRwpD7ohPdpQzmzka7K+q4cKR 6T5k30FkxsVW40ZVvxOENOLqV+9DF7RtzmVjxw+PurOXO1/rJY3deFOATSV0412sQkGf rIVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hd8si12940963ejc.34.2021.05.10.06.13.39; Mon, 10 May 2021 06:14:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349026AbhEJNAq (ORCPT + 99 others); Mon, 10 May 2021 09:00:46 -0400 Received: from mga12.intel.com ([192.55.52.136]:5890 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239855AbhEJMme (ORCPT ); Mon, 10 May 2021 08:42:34 -0400 IronPort-SDR: z24fSeGqboTCgD1CM7ec4CgOaFuEjPzBzLUOE2WJKrplqVO5MeW9spjUoYvd8izRdUYewBrnM4 U1AvrvklTFmQ== X-IronPort-AV: E=McAfee;i="6200,9189,9979"; a="178772958" X-IronPort-AV: E=Sophos;i="5.82,287,1613462400"; d="scan'208";a="178772958" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2021 05:41:23 -0700 IronPort-SDR: qxtEAUyUL8Rq2EkFNaJFKm1ws9a0ghx+MIVDB7HyOtsZQfq8UXDaBAjWk7k2jEp7vHTmqUv9k5 ejsakoIDQOnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,287,1613462400"; d="scan'208";a="433796216" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 10 May 2021 05:41:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 857BD202; Mon, 10 May 2021 15:41:37 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v3 05/14] spi: pxa2xx: Unify ifdeffery used in the headers Date: Mon, 10 May 2021 15:41:25 +0300 Message-Id: <20210510124134.24638-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210510124134.24638-1-andriy.shevchenko@linux.intel.com> References: <20210510124134.24638-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The two headers have quite different ifdeffery to prevent multiple inclusion. Unify them with the pattern that in particular reflects their location. Signed-off-by: Andy Shevchenko --- include/linux/pxa2xx_ssp.h | 6 +++--- include/linux/spi/pxa2xx_spi.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 7f73b26ed22e..14b049840faf 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -11,8 +11,8 @@ * PXA3xx SSP1, SSP2, SSP3, SSP4 */ -#ifndef __LINUX_SSP_H -#define __LINUX_SSP_H +#ifndef __LINUX_PXA2XX_SSP_H +#define __LINUX_PXA2XX_SSP_H #include #include @@ -270,4 +270,4 @@ static inline struct ssp_device *pxa_ssp_request_of(const struct device_node *n, static inline void pxa_ssp_free(struct ssp_device *ssp) {} #endif -#endif +#endif /* __LINUX_PXA2XX_SSP_H */ diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index 1e0e2f136319..12ef04d0896d 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -2,8 +2,8 @@ /* * Copyright (C) 2005 Stephen Street / StreetFire Sound Labs */ -#ifndef __linux_pxa2xx_spi_h -#define __linux_pxa2xx_spi_h +#ifndef __LINUX_SPI_PXA2XX_SPI_H +#define __LINUX_SPI_PXA2XX_SPI_H #include @@ -51,4 +51,5 @@ struct pxa2xx_spi_chip { extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_controller *info); #endif -#endif + +#endif /* __LINUX_SPI_PXA2XX_SPI_H */ -- 2.30.2