Unverified Commit 61f85372 authored by Mark Brown's avatar Mark Brown
Browse files

ASoc: Another series to convert to struct 

Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:

This is another series to convert ASoC drivers to use struct
platform_driver:remove_new(). The rockchip one was already send before
but with a wrong subject prefix, the cs42l43 driver is newer than the
last series. The remaining five patches are for driver combos that my
coccinelle patch failed to detect before.
parents 145d7e5a 72422652

include/sound/simple_card_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv, 
				char *prefix);

int simple_util_init_priv(struct simple_util_priv *priv,

			       struct link_info *li);

int simple_util_remove(struct platform_device *pdev);

void simple_util_remove(struct platform_device *pdev);



int graph_util_card_probe(struct snd_soc_card *card);

int graph_util_is_ports0(struct device_node *port);

sound/soc/codecs/cs42l43.c

+2 −4
Original line number Diff line number Diff line
@@ -2232,13 +2232,11 @@ static int cs42l43_codec_probe(struct platform_device *pdev) 
	return ret;

}



static int cs42l43_codec_remove(struct platform_device *pdev)

static void cs42l43_codec_remove(struct platform_device *pdev)

{

	struct cs42l43_codec *priv = platform_get_drvdata(pdev);



	clk_put(priv->mclk);



	return 0;

}



static int cs42l43_codec_runtime_resume(struct device *dev)
@@ -2269,7 +2267,7 @@ static struct platform_driver cs42l43_codec_driver = { 
	},



	.probe		= cs42l43_codec_probe,

	.remove		= cs42l43_codec_remove,

	.remove_new	= cs42l43_codec_remove,

	.id_table	= cs42l43_codec_id_table,

};

module_platform_driver(cs42l43_codec_driver);

sound/soc/generic/audio-graph-card.c

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static struct platform_driver graph_card = { 
		.of_match_table = graph_of_match,

	},

	.probe = graph_probe,

	.remove = simple_util_remove,

	.remove_new = simple_util_remove,

};

module_platform_driver(graph_card);

sound/soc/generic/audio-graph-card2-custom-sample.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct platform_driver custom_card = { 
		.of_match_table = custom_of_match,

	},

	.probe	= custom_probe,

	.remove	= simple_util_remove,

	.remove_new = simple_util_remove,

};

module_platform_driver(custom_card);

sound/soc/generic/audio-graph-card2.c

+1 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static struct platform_driver graph_card = { 
		.of_match_table = graph_of_match,

	},

	.probe	= graph_probe,

	.remove	= simple_util_remove,

	.remove_new = simple_util_remove,

};

module_platform_driver(graph_card);