Unverified Commit 9958d859 authored by Rob Herring's avatar Rob Herring Committed by Mark Brown
Browse files

ASoC: Use device_get_match_data() 



Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231006-dt-asoc-header-cleanups-v3-5-13a4f0f7fee6@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ec5236c2

sound/soc/intel/keembay/kmb_platform.c

+1 −12
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/io.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <sound/dmaengine_pcm.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -820,7 +819,6 @@ static int kmb_plat_dai_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node;

	struct snd_soc_dai_driver *kmb_i2s_dai;

	const struct of_device_id *match;

	struct device *dev = &pdev->dev;

	struct kmb_i2s_info *kmb_i2s;

	struct resource *res;
@@ -831,16 +829,7 @@ static int kmb_plat_dai_probe(struct platform_device *pdev) 
	if (!kmb_i2s)

		return -ENOMEM;



	kmb_i2s_dai = devm_kzalloc(dev, sizeof(*kmb_i2s_dai), GFP_KERNEL);

	if (!kmb_i2s_dai)

		return -ENOMEM;



	match = of_match_device(kmb_plat_of_match, &pdev->dev);

	if (!match) {

		dev_err(&pdev->dev, "Error: No device match found\n");

		return -ENODEV;

	}

	kmb_i2s_dai = (struct snd_soc_dai_driver *) match->data;

	kmb_i2s_dai = (struct snd_soc_dai_driver *)device_get_match_data(&pdev->dev);



	/* Prepare the related clocks */

	kmb_i2s->clk_apb = devm_clk_get(dev, "apb_clk");

sound/soc/qcom/lpass-cpu.c

+5 −10
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -1106,7 +1105,6 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
	struct resource *res;

	const struct lpass_variant *variant;

	struct device *dev = &pdev->dev;

	const struct of_device_id *match;

	int ret, i, dai_id;



	dsp_of_node = of_parse_phandle(pdev->dev.of_node, "qcom,adsp", 0);
@@ -1121,17 +1119,14 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
		return -ENOMEM;

	platform_set_drvdata(pdev, drvdata);



	match = of_match_device(dev->driver->of_match_table, dev);

	if (!match || !match->data)

	variant = device_get_match_data(dev);

	if (!variant)

		return -EINVAL;



	if (of_device_is_compatible(dev->of_node, "qcom,lpass-cpu-apq8016")) {

		dev_warn(dev, "%s compatible is deprecated\n",

			 match->compatible);

	}

	if (of_device_is_compatible(dev->of_node, "qcom,lpass-cpu-apq8016"))

		dev_warn(dev, "qcom,lpass-cpu-apq8016 compatible is deprecated\n");



	drvdata->variant = (struct lpass_variant *)match->data;

	variant = drvdata->variant;

	drvdata->variant = variant;



	of_lpass_cpu_parse_dai_data(dev, drvdata);

sound/soc/rockchip/rockchip_i2s.c

+3 −5
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
#include <linux/module.h>

#include <linux/mfd/syscon.h>

#include <linux/delay.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_device.h>

#include <linux/clk.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pm_runtime.h>
@@ -736,7 +736,6 @@ static int rockchip_i2s_init_dai(struct rk_i2s_dev *i2s, struct resource *res, 
static int rockchip_i2s_probe(struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	const struct of_device_id *of_id;

	struct rk_i2s_dev *i2s;

	struct snd_soc_dai_driver *dai;

	struct resource *res;
@@ -752,11 +751,10 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 


	i2s->grf = syscon_regmap_lookup_by_phandle(node, "rockchip,grf");

	if (!IS_ERR(i2s->grf)) {

		of_id = of_match_device(rockchip_i2s_match, &pdev->dev);

		if (!of_id || !of_id->data)

		i2s->pins = device_get_match_data(&pdev->dev);

		if (!i2s->pins)

			return -EINVAL;



		i2s->pins = of_id->data;

	}



	/* try to prepare related clocks */

sound/soc/rockchip/rockchip_i2s_tdm.c

+8 −16
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 
#include <linux/delay.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of.h>

#include <linux/pm_runtime.h>

#include <linux/regmap.h>

#include <linux/reset.h>
@@ -75,7 +73,7 @@ struct rk_i2s_tdm_dev { 
	struct snd_dmaengine_dai_dma_data playback_dma_data;

	struct reset_control *tx_reset;

	struct reset_control *rx_reset;

	struct rk_i2s_soc_data *soc_data;

	const struct rk_i2s_soc_data *soc_data;

	bool is_master_mode;

	bool io_multiplex;

	bool mclk_calibrate;
@@ -1277,21 +1275,21 @@ static const struct txrx_config rv1126_txrx_config[] = { 
	{ 0xff800000, 0x10260, RV1126_I2S0_CLK_TXONLY, RV1126_I2S0_CLK_RXONLY },

};



static struct rk_i2s_soc_data px30_i2s_soc_data = {

static const struct rk_i2s_soc_data px30_i2s_soc_data = {

	.softrst_offset = 0x0300,

	.configs = px30_txrx_config,

	.config_count = ARRAY_SIZE(px30_txrx_config),

	.init = common_soc_init,

};



static struct rk_i2s_soc_data rk1808_i2s_soc_data = {

static const struct rk_i2s_soc_data rk1808_i2s_soc_data = {

	.softrst_offset = 0x0300,

	.configs = rk1808_txrx_config,

	.config_count = ARRAY_SIZE(rk1808_txrx_config),

	.init = common_soc_init,

};



static struct rk_i2s_soc_data rk3308_i2s_soc_data = {

static const struct rk_i2s_soc_data rk3308_i2s_soc_data = {

	.softrst_offset = 0x0400,

	.grf_reg_offset = 0x0308,

	.grf_shift = 5,
@@ -1300,14 +1298,14 @@ static struct rk_i2s_soc_data rk3308_i2s_soc_data = { 
	.init = common_soc_init,

};



static struct rk_i2s_soc_data rk3568_i2s_soc_data = {

static const struct rk_i2s_soc_data rk3568_i2s_soc_data = {

	.softrst_offset = 0x0400,

	.configs = rk3568_txrx_config,

	.config_count = ARRAY_SIZE(rk3568_txrx_config),

	.init = common_soc_init,

};



static struct rk_i2s_soc_data rv1126_i2s_soc_data = {

static const struct rk_i2s_soc_data rv1126_i2s_soc_data = {

	.softrst_offset = 0x0300,

	.configs = rv1126_txrx_config,

	.config_count = ARRAY_SIZE(rv1126_txrx_config),
@@ -1544,7 +1542,6 @@ static int rockchip_i2s_tdm_rx_path_prepare(struct rk_i2s_tdm_dev *i2s_tdm, 
static int rockchip_i2s_tdm_probe(struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	const struct of_device_id *of_id;

	struct rk_i2s_tdm_dev *i2s_tdm;

	struct resource *res;

	void __iomem *regs;
@@ -1556,13 +1553,8 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev) 


	i2s_tdm->dev = &pdev->dev;



	of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev);

	if (!of_id)

		return -EINVAL;



	spin_lock_init(&i2s_tdm->lock);

	i2s_tdm->soc_data = (struct rk_i2s_soc_data *)of_id->data;



	i2s_tdm->soc_data = device_get_match_data(&pdev->dev);

	i2s_tdm->frame_width = 64;



	i2s_tdm->clk_trcm = TRCM_TXRX;

sound/soc/rockchip/rockchip_pdm.c

+1 −6
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/module.h>

#include <linux/clk.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <linux/rational.h>

#include <linux/regmap.h>
@@ -572,7 +571,6 @@ static int rockchip_pdm_path_parse(struct rk_pdm_dev *pdm, struct device_node *n 
static int rockchip_pdm_probe(struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	const struct of_device_id *match;

	struct rk_pdm_dev *pdm;

	struct resource *res;

	void __iomem *regs;
@@ -582,10 +580,7 @@ static int rockchip_pdm_probe(struct platform_device *pdev) 
	if (!pdm)

		return -ENOMEM;



	match = of_match_device(rockchip_pdm_match, &pdev->dev);

	if (match)

		pdm->version = (uintptr_t)match->data;



	pdm->version = (enum rk_pdm_version)device_get_match_data(&pdev->dev);

	if (pdm->version == RK_PDM_RK3308) {

		pdm->reset = devm_reset_control_get(&pdev->dev, "pdm-m");

		if (IS_ERR(pdm->reset))