From patchwork Fri Sep 21 16:24:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 147300 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1014536ljw; Fri, 21 Sep 2018 09:24:15 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda7uDhL7iO01v/epFFnfJ3FyOx0aI6Jgjx4sDShLRME5Vy3/k/B9bp+WYgegaijsLlZzwVV X-Received: by 2002:a1c:1745:: with SMTP id 66-v6mr7847031wmx.38.1537547055878; Fri, 21 Sep 2018 09:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537547055; cv=none; d=google.com; s=arc-20160816; b=Z6BqczLFRPMcBlaxK+7Ue9FD0cGJst1QURD5x4JdosXb3d3ODyeFe99M2fI/ZKd+An TBX7abHxBwYS0VFon2K3JbQ79GiDMAVdTcHnlcDbvgsptbGF12+n016rRv60nsXnZTPF 7pVrkS792OcPNqActLlWijs7hkWxQgIKKwmGfsSe/aWvs3DIaF/jHS8B8CyQCohbWpMp FGyoDE06hFePSCXgcRlmvDCwaDgtT40ds9RradeTDExmtW6et3R7sMSYo0a2XamyHBmh 4BizD8bmAxzqRvWBjPILDQsl7lAWfKzdaBmzbY3JewEJkqMiA1Skh8lTl+sJBu67WYIw eDeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=W9HTHZlaP6M/L46A9WuSUHrbc2Q5axoyiClI+kZ/oms=; b=0MTCs5ZI/ml0f2qF3qGxYfA+nhiS67/XfE4PNmvY4kBAYqgDQZZdP2ruNt+hEG93CN qB+uulm86Yj9W0G/R/Nk0nZkkVhcFAY8qwe8fGgIWzj3vVikXtu7d0XhiSjrU43c/gn/ lFt1ac2SMnA7Eswj/aU2tlRQt1oIa+ciXq7RWJaFRnGBYgNPk3CNEkyJnmf45yvIsGHV j/GuYP9w9rnklk3HFDTFD+oUbCatXbsT4yfk72xjerW7864rDysSiwIaSLsjjfcEJ5PF je11leirQvGFZ9tUKerXCtgxo+WP+AETMZVWVbAra8FK5cTZ0TYKeK5cHOaCfZGJb0ej x8bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dlnFLsle; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z6si693710wrw.97.2018.09.21.09.24.15; Fri, 21 Sep 2018 09:24:15 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dlnFLsle; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E03FE267892; Fri, 21 Sep 2018 18:24:13 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 26CFA267892; Fri, 21 Sep 2018 18:24:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id B6C9F2676A7 for ; Fri, 21 Sep 2018 18:24:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=x0HIHeMDI5FBI3EiaXahGSEiZVp4OpwLFIS6XWFufK8=; b=dlnFLsleVVw5 WWl5yfRcFNi5TZQMmfYee4n72SdO+TeVJb2c8rCasq1vOyhJdjQxilf6dMJzrPL+aSkZb6UTmLkmg 9v4OGwY54+ZU9F/PME00xHmiMYJYnXdPGbBU7yBuM3iyqs69RdO91fg+O9bRwGnGE6L3dCfFf+y/d Ls1DE=; Received: from [209.121.128.187] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g3ODu-0000eC-MR; Fri, 21 Sep 2018 16:24:06 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 9AF74440078; Fri, 21 Sep 2018 17:24:04 +0100 (BST) From: Mark Brown To: zhong jiang In-Reply-To: Message-Id: <20180921162404.9AF74440078@finisterre.ee.mobilebroadband> Date: Fri, 21 Sep 2018 17:24:04 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: qcom: qdsp6: remove duplicated include from q6adm.c" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: qcom: qdsp6: remove duplicated include from q6adm.c has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c78d42c7fbd6f2a27a665bcd1ab60c9df617f7c9 Mon Sep 17 00:00:00 2001 From: zhong jiang Date: Fri, 21 Sep 2018 18:24:58 +0800 Subject: [PATCH] ASoC: qcom: qdsp6: remove duplicated include from q6adm.c We include wait.h twice in q6adm.c. it is unnecessary. hence remove it. Further, order the include files as alphabet. Signed-off-by: zhong jiang Signed-off-by: Mark Brown --- sound/soc/qcom/qdsp6/q6adm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.19.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c index 932c3ebfd252..da242515e146 100644 --- a/sound/soc/qcom/qdsp6/q6adm.c +++ b/sound/soc/qcom/qdsp6/q6adm.c @@ -2,25 +2,24 @@ // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2018, Linaro Limited -#include -#include -#include #include -#include -#include #include +#include +#include +#include #include #include -#include -#include -#include #include +#include +#include +#include +#include #include #include "q6adm.h" #include "q6afe.h" #include "q6core.h" -#include "q6dsp-errno.h" #include "q6dsp-common.h" +#include "q6dsp-errno.h" #define ADM_CMD_DEVICE_OPEN_V5 0x00010326 #define ADM_CMDRSP_DEVICE_OPEN_V5 0x00010329