From: Mark Brown <broonie@kernel.org>
Date: Mon, 9 Oct 2023 19:49:16 +0000 (+0100)
Subject: ASoC: DT matching and header cleanups
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7ec043e601d1dca69ac827f51dbe1dbaa1e89aa;p=linux.git

ASoC: DT matching and header cleanups

Merge series from Rob Herring <robh@kernel.org>:

This is a series is part of ongoing clean-ups related to device
matching and DT related implicit includes. Essentially of_device.h has
a bunch of implicit includes and generally isn't needed any nore except
for of_match_device(). As we also generally want to get rid of
of_match_device() as well, I've done that so we're not updating the
includes twice.
---

a7ec043e601d1dca69ac827f51dbe1dbaa1e89aa
diff --cc sound/soc/qcom/sc7280.c
index f61989d6b57d0,f636c0d2ca363..d36f029b78889
--- a/sound/soc/qcom/sc7280.c
+++ b/sound/soc/qcom/sc7280.c
@@@ -4,11 -4,9 +4,11 @@@
  //
  // ALSA SoC Machine driver for sc7280
  
 +#include <dt-bindings/sound/qcom,lpass.h>
 +#include <dt-bindings/sound/qcom,q6afe.h>
  #include <linux/input.h>
+ #include <linux/mod_devicetable.h>
  #include <linux/module.h>
- #include <linux/of_device.h>
  #include <linux/platform_device.h>
  #include <sound/core.h>
  #include <sound/jack.h>
diff --cc sound/soc/qcom/sc8280xp.c
index 6d4a43f94d515,870d7b69465dd..d93b18f07be59
--- a/sound/soc/qcom/sc8280xp.c
+++ b/sound/soc/qcom/sc8280xp.c
@@@ -1,10 -1,9 +1,9 @@@
  // SPDX-License-Identifier: GPL-2.0
  // Copyright (c) 2022, Linaro Limited
  
 -#include <linux/mod_devicetable.h>
 +#include <dt-bindings/sound/qcom,q6afe.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
- #include <linux/of_device.h>
  #include <sound/soc.h>
  #include <sound/soc-dapm.h>
  #include <sound/pcm.h>
diff --cc sound/soc/qcom/sdm845.c
index fed5673b61ba6,ad65e45644c39..252a0f0819be1
--- a/sound/soc/qcom/sdm845.c
+++ b/sound/soc/qcom/sdm845.c
@@@ -3,10 -3,9 +3,9 @@@
   * Copyright (c) 2018, The Linux Foundation. All rights reserved.
   */
  
 -#include <linux/mod_devicetable.h>
 +#include <dt-bindings/sound/qcom,q6afe.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
- #include <linux/of_device.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
diff --cc sound/soc/qcom/sm8250.c
index b7e1a5496cfd8,92350e9cc30eb..9cc869fd70ac1
--- a/sound/soc/qcom/sm8250.c
+++ b/sound/soc/qcom/sm8250.c
@@@ -1,10 -1,9 +1,9 @@@
  // SPDX-License-Identifier: GPL-2.0
  // Copyright (c) 2020, Linaro Limited
  
 -#include <linux/mod_devicetable.h>
 +#include <dt-bindings/sound/qcom,q6afe.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
- #include <linux/of_device.h>
  #include <sound/soc.h>
  #include <sound/soc-dapm.h>
  #include <sound/pcm.h>
diff --cc sound/soc/rockchip/rockchip_max98090.c
index e3d603dbc1518,c4d79de5d1aa8..783956dc83b52
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@@ -6,9 -6,10 +6,9 @@@
   */
  
  #include <linux/module.h>
- #include <linux/of_device.h>
+ #include <linux/of.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
 -#include <linux/gpio.h>
  #include <sound/core.h>
  #include <sound/jack.h>
  #include <sound/pcm.h>