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

Commit 1558eb83 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/pm-convert' into for-next 

This merges the changes for converting to new PM ops for platform
and some other drivers.
Also move some header files to local places from the public
include/sound.
parents 4609ed6b 81fcb170

include/sound/vx_core.h

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ int vx_change_frequency(struct vx_core *chip); 
/*

 * PM

 */

int snd_vx_suspend(struct vx_core *card, pm_message_t state);

int snd_vx_suspend(struct vx_core *card);

int snd_vx_resume(struct vx_core *card);



/*

sound/arm/pxa2xx-ac97.c

+3 −6
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = { 


#ifdef CONFIG_PM



static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)

static int pxa2xx_ac97_do_suspend(struct snd_card *card)

{

	pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
@@ -144,7 +144,7 @@ static int pxa2xx_ac97_suspend(struct device *dev) 
	int ret = 0;



	if (card)

		ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);

		ret = pxa2xx_ac97_do_suspend(card);



	return ret;

}
@@ -160,10 +160,7 @@ static int pxa2xx_ac97_resume(struct device *dev) 
	return ret;

}



static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {

	.suspend	= pxa2xx_ac97_suspend,

	.resume		= pxa2xx_ac97_resume,

};

static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);

#endif



static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)

sound/atmel/abdac.c

+10 −8
Original line number Diff line number Diff line
@@ -535,9 +535,9 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

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

static int atmel_abdac_suspend(struct device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(pdev);

	struct atmel_abdac *dac = card->private_data;



	dw_dma_cyclic_stop(dac->dma.chan);
@@ -547,9 +547,9 @@ static int atmel_abdac_suspend(struct platform_device *pdev, pm_message_t msg) 
	return 0;

}



static int atmel_abdac_resume(struct platform_device *pdev)

static int atmel_abdac_resume(struct device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(pdev);

	struct atmel_abdac *dac = card->private_data;



	clk_enable(dac->pclk);
@@ -559,9 +559,11 @@ static int atmel_abdac_resume(struct platform_device *pdev) 


	return 0;

}



static SIMPLE_DEV_PM_OPS(atmel_abdac_pm, atmel_abdac_suspend, atmel_abdac_resume);

#define ATMEL_ABDAC_PM_OPS	&atmel_abdac_pm

#else

#define atmel_abdac_suspend NULL

#define atmel_abdac_resume NULL

#define ATMEL_ABDAC_PM_OPS	NULL

#endif



static int __devexit atmel_abdac_remove(struct platform_device *pdev)
@@ -589,9 +591,9 @@ static struct platform_driver atmel_abdac_driver = { 
	.remove		= __devexit_p(atmel_abdac_remove),

	.driver		= {

		.name	= "atmel_abdac",

		.owner	= THIS_MODULE,

		.pm	= ATMEL_ABDAC_PM_OPS,

	},

	.suspend	= atmel_abdac_suspend,

	.resume		= atmel_abdac_resume,

};



static int __init atmel_abdac_init(void)

sound/atmel/ac97c.c

+10 −8
Original line number Diff line number Diff line
@@ -1135,9 +1135,9 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

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

static int atmel_ac97c_suspend(struct device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(pdev);

	struct atmel_ac97c *chip = card->private_data;



	if (cpu_is_at32ap7000()) {
@@ -1151,9 +1151,9 @@ static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg) 
	return 0;

}



static int atmel_ac97c_resume(struct platform_device *pdev)

static int atmel_ac97c_resume(struct device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(pdev);

	struct atmel_ac97c *chip = card->private_data;



	clk_enable(chip->pclk);
@@ -1165,9 +1165,11 @@ static int atmel_ac97c_resume(struct platform_device *pdev) 
	}

	return 0;

}



static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume);

#define ATMEL_AC97C_PM_OPS	&atmel_ac97c_pm

#else

#define atmel_ac97c_suspend NULL

#define atmel_ac97c_resume NULL

#define ATMEL_AC97C_PM_OPS	NULL

#endif



static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
@@ -1210,9 +1212,9 @@ static struct platform_driver atmel_ac97c_driver = { 
	.remove		= __devexit_p(atmel_ac97c_remove),

	.driver		= {

		.name	= "atmel_ac97c",

		.owner	= THIS_MODULE,

		.pm	= ATMEL_AC97C_PM_OPS,

	},

	.suspend	= atmel_ac97c_suspend,

	.resume		= atmel_ac97c_resume,

};



static int __init atmel_ac97c_init(void)

sound/drivers/aloop.c

+12 −10
Original line number Diff line number Diff line
@@ -1177,10 +1177,9 @@ static int __devexit loopback_remove(struct platform_device *devptr) 
}



#ifdef CONFIG_PM

static int loopback_suspend(struct platform_device *pdev,

				pm_message_t state)

static int loopback_suspend(struct device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(pdev);

	struct loopback *loopback = card->private_data;



	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
@@ -1190,13 +1189,18 @@ static int loopback_suspend(struct platform_device *pdev, 
	return 0;

}

	

static int loopback_resume(struct platform_device *pdev)

static int loopback_resume(struct device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);

	struct snd_card *card = dev_get_drvdata(pdev);



	snd_power_change_state(card, SNDRV_CTL_POWER_D0);

	return 0;

}



static SIMPLE_DEV_PM_OPS(loopback_pm, loopback_suspend, loopback_resume);

#define LOOPBACK_PM_OPS	&loopback_pm

#else

#define LOOPBACK_PM_OPS	NULL

#endif



#define SND_LOOPBACK_DRIVER	"snd_aloop"
@@ -1204,12 +1208,10 @@ static int loopback_resume(struct platform_device *pdev) 
static struct platform_driver loopback_driver = {

	.probe		= loopback_probe,

	.remove		= __devexit_p(loopback_remove),

#ifdef CONFIG_PM

	.suspend	= loopback_suspend,

	.resume		= loopback_resume,

#endif

	.driver		= {

		.name	= SND_LOOPBACK_DRIVER

		.name	= SND_LOOPBACK_DRIVER,

		.owner	= THIS_MODULE,

		.pm	= LOOPBACK_PM_OPS,

	},

};