From patchwork Fri Jul 14 17:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13314036 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72BB0C0015E for ; Fri, 14 Jul 2023 17:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=duoWoqxZrZMQh6a9wItoGnFt+PuxwLpcnqgEfVyhLH0=; b=yVCDFmz0+WfIeT K+A5eNkSHOF3vLzHCDinYY7dZvtHyJ0j65h1gkx74O+8jshBbkkFnKoR0Pvnxu4FD3w3uHJr99wCp sh150eUCeVys4dF/ogQTV+5DBB3RMvSgMIKsbZvHToC/xlXWYxcLetGnzg7dG1JNz7BKH9BqdIK5j Ja1Q2f16mQwSvPyzu7RExNDRlCJBevG4qc7f1ktp1yeEfKOKnDcCnuPwve50ufirSZKsZwCFwZmbs S9aej8S1jFwNdYaVf0IZmTNQaSu9J6SxJu35rl9lEdHQTo/KssgK7Km4lAKMaqlCvLE5QtBQpymss tulcl8Cckt9MeUrJG+qQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qKMxG-006rsA-2o; Fri, 14 Jul 2023 17:51:46 +0000 Received: from mail-io1-f51.google.com ([209.85.166.51]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qKMx7-006rez-2Q for linux-arm-kernel@lists.infradead.org; Fri, 14 Jul 2023 17:51:44 +0000 Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-7869bcee569so86675639f.0 for ; Fri, 14 Jul 2023 10:51:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357097; x=1691949097; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jV0ZVw+tXJJaX6sFXrDUifNmdjozDg0jsFO9uzlP0KY=; b=MPmIRQ8WthDmNtxmbPdAUCLTquRYDvWMLMPb4hYJqwNZVLuLl1ElAa9BGHRSPXvEuM N7DJM0A8NkC7fsSgewyq+k2nWqT2Kcj+I1Hfbi5iQ07dtkbOHz/UB5nPTHf42Dxbb/2Z SnN17X7M29l3mpgr6V5kzaof4NQj260JW7e49+WN5xaZ3Qc1tiZUfXFM0ldXMm7W1gDx 0Vh2NS3gm512PIfkYa/qZ56PUhb7HuuQrubj+qWMRuMdepw7ZHiAZcUfRUoy1YWbsgwQ 7ezhOg91Slmd87cUAArBfuNEyrPMq/0eSLanjOdKRYtYl1Gj0x3XsLVxD9f61P/bwmXf Jsxw== X-Gm-Message-State: ABy/qLalp9TxeHtQ+Mj9NnCyzbrSkMlP2FIyhaLvZxalkyGnnarnX574 XNoErIYrpz0iU5laJi4Kuu6ruJGI/qAx X-Google-Smtp-Source: APBJJlGxSu03yLG4CUI74yCQInNqkiQy4rOqdX6zUkTVngY8Cs5QXVjapqeBVhmSeXBcmI8RKct4iA== X-Received: by 2002:a6b:db02:0:b0:783:5e93:1e7f with SMTP id t2-20020a6bdb02000000b007835e931e7fmr5310749ioc.18.1689357096822; Fri, 14 Jul 2023 10:51:36 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id i10-20020a02b68a000000b004290fd3a68dsm2731869jam.1.2023.07.14.10.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:51:36 -0700 (PDT) Received: (nullmailer pid 4066909 invoked by uid 1000); Fri, 14 Jul 2023 17:51:23 -0000 From: Rob Herring To: Jaroslav Kysela , Takashi Iwai , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Thierry Reding , Jonathan Hunter Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH] ALSA: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:51:08 -0600 Message-Id: <20230714175109.4066599-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230714_105137_813951_AE1FC6C5 X-CRM114-Status: GOOD ( 14.08 ) 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 The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Signed-off-by: Rob Herring --- sound/atmel/ac97c.c | 3 +-- sound/drivers/serial-generic.c | 2 +- sound/pci/hda/hda_tegra.c | 3 ++- sound/ppc/awacs.c | 1 + sound/ppc/burgundy.c | 1 + sound/sparc/amd7930.c | 3 +-- sound/sparc/cs4231.c | 2 +- sound/sparc/dbri.c | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index c8912b8a1dc5..402b5f66dcc3 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -12,13 +12,12 @@ #include #include #include +#include #include #include #include #include #include -#include -#include #include #include diff --git a/sound/drivers/serial-generic.c b/sound/drivers/serial-generic.c index e1f864dc7939..b0262541802a 100644 --- a/sound/drivers/serial-generic.c +++ b/sound/drivers/serial-generic.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index 9d0ab043880b..39fa036616ce 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -16,7 +16,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c index 53d558b2806c..659866cfe3b4 100644 --- a/sound/ppc/awacs.c +++ b/sound/ppc/awacs.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include "pmac.h" diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index 4fb990ab2ceb..400a886562b1 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "pmac.h" #include "burgundy.h" diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index c434b69a83f1..0fea04acc3ea 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -47,7 +47,6 @@ #include #include -#include static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 31bac355ec4d..c2ad3fa2f25a 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 376aed136a45..050e98f32d36 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -69,7 +69,7 @@ #include #include -#include +#include #include #include