From patchwork Fri Apr 23 16:34:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12220973 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AABDDC433B4 for ; Fri, 23 Apr 2021 16:40:08 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 354FE61462 for ; Fri, 23 Apr 2021 16:40:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 354FE61462 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pgxf1DwrQzSPlKdUZtR0DRCPR8cKKDUxMQ6Xi+f053s=; b=JCNLsNtjEhbW4+rqXjy5asaqQ rdKbyuzLrpi2MgSGnT62UwOjc87gCyEEZqzZCJD4bIar/fed6GO46KgObbhiHu2qeEywYsbUyVBQ1 ekb2jG6Bl7JDFr/zm9VxZT3cOT0PhA0wREhyNwDJJzO6WO87SqCmIFa/8MqDmcl1vF/DajXvPU1Db WnN0bsfo3278hUCg1Jk6SIa6BFAIaTKgJmomtokBPf9paO99MZRw4VYsqCPjrsmHh1tlN1c/arEsx ESjGK2FtBxIl2oyR5mjTb5XxZqmAbHZVBbQ0v6cbqH9Av3TXh7T0RH03m9acRHQruItCZXHk60txl ND0Q6aZTg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZyoe-001szQ-FG; Fri, 23 Apr 2021 16:38:04 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZylY-001s6J-MJ for linux-arm-kernel@desiato.infradead.org; Fri, 23 Apr 2021 16:34:56 +0000 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:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=3m0dySYVlvXYoz3zULV38n3VGycqgLa7+kTl7XxWvnw=; b=UivMxEnnbXTUvs+Ep57Jpz1sva yi9ygGblPEjY+hjQWIdTvh2gMhWOp/m2nj3NWhyOpzlEYscXDUuB3eWY88oCYTf2Ty+ObVDV4O/CV WdjDMtwatxjMkRSY6CE1tbRL32QA4IUlmc9VVS98tfDwyPYxBpKDe6zPrdUZeldDrOUBQ/e2aGE0P dmFM2ziJiaJ9Tk7XtBHfv2mx1o4rHP7mTEjtupBIN82uut6TdJnzRXpLtFIi4ifX7m0swI/VvDxST /mT+omHErpSKMZulTowCPCxuXya4piiSseWiCcu85V8/4djXBcoNVDWGbpqG7MThyEk5HNbAuIeO4 7c5qtAdA==; Received: from mga11.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZylR-00EYGh-Jd for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 16:34:51 +0000 IronPort-SDR: 3unaQ/gda0s74pOK+xAepbzzMFUj+1fw1pRTNdmFZT3Ir5eG9Z+QRg8mY/rUGhBMunVOZ8SS7I 3AuUPFuo1TmA== X-IronPort-AV: E=McAfee;i="6200,9189,9963"; a="192910030" X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="192910030" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2021 09:34:43 -0700 IronPort-SDR: gFOnInLtpr118H5FS9N61WsDF0pFMGItxr57URSWM2ZdEl/u0yzSayeCRAR1wweiowyb+EUYR4 /VSga8nRzIOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="421810613" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 23 Apr 2021 09:34:38 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C0B021C8; Fri, 23 Apr 2021 19:34:55 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Mark Brown , Cezary Rojewski , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, alsa-devel@alsa-project.org Cc: Dmitry Torokhov , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v1 05/14] spi: pxa2xx: Consolidate related headers under include/linux/spi Date: Fri, 23 Apr 2021 19:34:28 +0300 Message-Id: <20210423163437.89306-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210423163437.89306-1-andriy.shevchenko@linux.intel.com> References: <20210423163437.89306-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210423_093445_688420_15F46374 X-CRM114-Status: GOOD ( 14.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We have two headers split between include/linux and include/linux/spi. Consolidated them under SPI realm, i.e. in the latter folder. Update users accordingly. Signed-off-by: Andy Shevchenko --- drivers/input/mouse/navpoint.c | 3 ++- drivers/spi/spi-pxa2xx-dma.c | 2 -- drivers/spi/spi-pxa2xx-pci.c | 1 + drivers/spi/spi-pxa2xx.h | 2 +- include/linux/spi/pxa2xx_spi.h | 9 +++++---- include/linux/{ => spi}/pxa2xx_ssp.h | 6 +++--- sound/soc/intel/catpt/dsp.c | 4 +++- sound/soc/pxa/pxa-ssp.c | 3 ++- 8 files changed, 17 insertions(+), 13 deletions(-) rename include/linux/{ => spi}/pxa2xx_ssp.h (99%) diff --git a/drivers/input/mouse/navpoint.c b/drivers/input/mouse/navpoint.c index 4d67575bb276..a0731cfbbafa 100644 --- a/drivers/input/mouse/navpoint.c +++ b/drivers/input/mouse/navpoint.c @@ -15,9 +15,10 @@ #include #include #include -#include #include +#include + /* * Synaptics Modular Embedded Protocol: Module Packet Format. * Module header byte 2:0 = Length (# bytes that follow) diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index 32ab7391396d..e00dbadd39ec 100644 --- a/drivers/spi/spi-pxa2xx-dma.c +++ b/drivers/spi/spi-pxa2xx-dma.c @@ -15,8 +15,6 @@ #include #include -#include - #include "spi-pxa2xx.h" static void pxa2xx_spi_dma_transfer_complete(struct driver_data *drv_data, diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c index f60ed4c62000..5af0a3fbc1b0 100644 --- a/drivers/spi/spi-pxa2xx-pci.c +++ b/drivers/spi/spi-pxa2xx-pci.c @@ -8,6 +8,7 @@ #include #include #include + #include #include diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h index 739e264feaa6..b6dae0981b61 100644 --- a/drivers/spi/spi-pxa2xx.h +++ b/drivers/spi/spi-pxa2xx.h @@ -12,7 +12,7 @@ #include #include -#include +#include struct gpio_desc; struct pxa2xx_spi_controller; diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index 1e0e2f136319..4baae475bd89 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h @@ -2,12 +2,12 @@ /* * Copyright (C) 2005 Stephen Street / StreetFire Sound Labs */ -#ifndef __linux_pxa2xx_spi_h -#define __linux_pxa2xx_spi_h +#ifndef __LINUX_PXA2XX_SPI_H +#define __LINUX_PXA2XX_SPI_H #include -#include +#include #define PXA2XX_CS_ASSERT (0x01) #define PXA2XX_CS_DEASSERT (0x02) @@ -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_PXA2XX_SPI_H */ diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/spi/pxa2xx_ssp.h similarity index 99% rename from include/linux/pxa2xx_ssp.h rename to include/linux/spi/pxa2xx_ssp.h index 7f73b26ed22e..14b049840faf 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/spi/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/sound/soc/intel/catpt/dsp.c b/sound/soc/intel/catpt/dsp.c index 9c5fd18f2600..08af8bab8704 100644 --- a/sound/soc/intel/catpt/dsp.c +++ b/sound/soc/intel/catpt/dsp.c @@ -9,7 +9,9 @@ #include #include #include -#include + +#include + #include "core.h" #include "messages.h" #include "registers.h" diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index b941adcbb8f9..710c8dbd18bc 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -16,10 +16,11 @@ #include #include #include -#include #include #include +#include + #include #include