ASoC: DT matching and header cleanups
authorMark Brown <broonie@kernel.org>
Mon, 9 Oct 2023 19:49:16 +0000 (20:49 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 9 Oct 2023 22:14:18 +0000 (23:14 +0100)
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.

12 files changed:
1  2 
sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
sound/soc/qcom/lpass-cdc-dma.c
sound/soc/qcom/lpass-cpu.c
sound/soc/qcom/lpass-platform.c
sound/soc/qcom/qdsp6/q6asm-dai.c
sound/soc/qcom/qdsp6/q6routing.c
sound/soc/qcom/sc7180.c
sound/soc/qcom/sc7280.c
sound/soc/qcom/sc8280xp.c
sound/soc/qcom/sdm845.c
sound/soc/qcom/sm8250.c
sound/soc/rockchip/rockchip_max98090.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index f61989d6b57d090c34bde33dc94cbf94337fac82,f636c0d2ca363db704af013cc2c97f5afd887e3e..d36f029b788896e5afd391f6869c2d91a6fc8449
@@@ -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>
index 6d4a43f94d5156d9784d8328c6467905f7435e25,870d7b69465dda436d07a438465117d6356412be..d93b18f07be59a9218281c3f370983e6104d7970
@@@ -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>
index fed5673b61ba6f9baee873a4bdedc5ac47d5ab82,ad65e45644c396d10aa68ac5ed1c066dedf85adc..252a0f0819be1ef8d050eea290e53a22b5bf7f52
@@@ -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>
index b7e1a5496cfd8ea2a97ec272ecbdc0184b75e328,92350e9cc30eb944e5e2b420c8052dff75438e1e..9cc869fd70ac13713239a4d9d49990845098c15d
@@@ -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>
index e3d603dbc151808db25fcc85929bd552616da781,c4d79de5d1aa87156952092a66c23f00d5aed8b9..783956dc83b522d72b4bcea93e5e0abaa3d7ddf5
@@@ -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>