Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2058b0c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove snd_soc_suspend_device() 



The PM core will grow pm_link infrastructure in 2.6.33 which can be
used to implement the intended functionality of the ASoC-specific
device suspend and resume callbacks so drop them.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ed9d040d

include/sound/soc.h

+0 −5
Original line number Diff line number Diff line
@@ -223,11 +223,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, 
			       int addr_bits, int data_bits,

			       enum snd_soc_control_type control);



#ifdef CONFIG_PM

int snd_soc_suspend_device(struct device *dev);

int snd_soc_resume_device(struct device *dev);

#endif



/* pcm <-> DAI connect */

void snd_soc_free_pcms(struct snd_soc_device *socdev);

int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);

sound/soc/codecs/cs4270.c

+0 −20
Original line number Diff line number Diff line
@@ -802,22 +802,6 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id); 
 * and all registers are written back to the hardware when resuming.

 */



static int cs4270_i2c_suspend(struct i2c_client *client, pm_message_t mesg)

{

	struct cs4270_private *cs4270 = i2c_get_clientdata(client);

	struct snd_soc_codec *codec = &cs4270->codec;



	return snd_soc_suspend_device(codec->dev);

}



static int cs4270_i2c_resume(struct i2c_client *client)

{

	struct cs4270_private *cs4270 = i2c_get_clientdata(client);

	struct snd_soc_codec *codec = &cs4270->codec;



	return snd_soc_resume_device(codec->dev);

}



static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg)

{

	struct snd_soc_codec *codec = cs4270_codec;
@@ -853,8 +837,6 @@ static int cs4270_soc_resume(struct platform_device *pdev) 
	return snd_soc_write(codec, CS4270_PWRCTL, reg);

}

#else

#define cs4270_i2c_suspend	NULL

#define cs4270_i2c_resume	NULL

#define cs4270_soc_suspend	NULL

#define cs4270_soc_resume	NULL

#endif /* CONFIG_PM */
@@ -873,8 +855,6 @@ static struct i2c_driver cs4270_i2c_driver = { 
	.id_table = cs4270_id,

	.probe = cs4270_i2c_probe,

	.remove = cs4270_i2c_remove,

	.suspend = cs4270_i2c_suspend,

	.resume = cs4270_i2c_resume,

};



/*

sound/soc/codecs/wm8350.c

+0 −17
Original line number Diff line number Diff line
@@ -1680,21 +1680,6 @@ static int __devexit wm8350_codec_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

static int wm8350_codec_suspend(struct platform_device *pdev, pm_message_t m)

{

	return snd_soc_suspend_device(&pdev->dev);

}



static int wm8350_codec_resume(struct platform_device *pdev)

{

	return snd_soc_resume_device(&pdev->dev);

}

#else

#define wm8350_codec_suspend NULL

#define wm8350_codec_resume NULL

#endif



static struct platform_driver wm8350_codec_driver = {

	.driver = {

		   .name = "wm8350-codec",
@@ -1702,8 +1687,6 @@ static struct platform_driver wm8350_codec_driver = { 
		   },

	.probe = wm8350_codec_probe,

	.remove = __devexit_p(wm8350_codec_remove),

	.suspend = wm8350_codec_suspend,

	.resume = wm8350_codec_resume,

};



static __init int wm8350_init(void)

sound/soc/codecs/wm8400.c

+0 −17
Original line number Diff line number Diff line
@@ -1559,21 +1559,6 @@ static int __exit wm8400_codec_remove(struct platform_device *dev) 
	return 0;

}



#ifdef CONFIG_PM

static int wm8400_pdev_suspend(struct platform_device *pdev, pm_message_t msg)

{

	return snd_soc_suspend_device(&pdev->dev);

}



static int wm8400_pdev_resume(struct platform_device *pdev)

{

	return snd_soc_resume_device(&pdev->dev);

}

#else

#define wm8400_pdev_suspend NULL

#define wm8400_pdev_resume NULL

#endif



static struct platform_driver wm8400_codec_driver = {

	.driver = {

		.name = "wm8400-codec",
@@ -1581,8 +1566,6 @@ static struct platform_driver wm8400_codec_driver = { 
	},

	.probe = wm8400_codec_probe,

	.remove	= __exit_p(wm8400_codec_remove),

	.suspend = wm8400_pdev_suspend,

	.resume = wm8400_pdev_resume,

};



static int __init wm8400_codec_init(void)

sound/soc/codecs/wm8523.c

+0 −17
Original line number Diff line number Diff line
@@ -638,21 +638,6 @@ static __devexit int wm8523_i2c_remove(struct i2c_client *client) 
	return 0;

}



#ifdef CONFIG_PM

static int wm8523_i2c_suspend(struct i2c_client *i2c, pm_message_t msg)

{

	return snd_soc_suspend_device(&i2c->dev);

}



static int wm8523_i2c_resume(struct i2c_client *i2c)

{

	return snd_soc_resume_device(&i2c->dev);

}

#else

#define wm8523_i2c_suspend NULL

#define wm8523_i2c_resume NULL

#endif



static const struct i2c_device_id wm8523_i2c_id[] = {

	{ "wm8523", 0 },

	{ }
@@ -666,8 +651,6 @@ static struct i2c_driver wm8523_i2c_driver = { 
	},

	.probe =    wm8523_i2c_probe,

	.remove =   __devexit_p(wm8523_i2c_remove),

	.suspend =  wm8523_i2c_suspend,

	.resume =   wm8523_i2c_resume,

	.id_table = wm8523_i2c_id,

};

#endif