Просмотр исходного кода

[ALSA] Fix tas_suspend/resume build warning

sound/aoa/codecs/snd-aoa-codec-tas.c:750: warning: 'tas_suspend' defined but not used
sound/aoa/codecs/snd-aoa-codec-tas.c:760: warning: 'tas_resume' defined but not used
Acked-by: Johannes Berg <johannes@sipsolutions.net>

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Stephen Rothwell 18 лет назад
Родитель
Сommit
1f28960b46
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      sound/aoa/codecs/snd-aoa-codec-tas.c

+ 5 - 4
sound/aoa/codecs/snd-aoa-codec-tas.c

@@ -743,6 +743,7 @@ static int tas_switch_clock(struct codec_info_item *cii, enum clock_switch clock
 	return 0;
 	return 0;
 }
 }
 
 
+#ifdef CONFIG_PM
 /* we are controlled via i2c and assume that is always up
 /* we are controlled via i2c and assume that is always up
  * If that wasn't the case, we'd have to suspend once
  * If that wasn't the case, we'd have to suspend once
  * our i2c device is suspended, and then take note of that! */
  * our i2c device is suspended, and then take note of that! */
@@ -768,7 +769,6 @@ static int tas_resume(struct tas *tas)
 	return 0;
 	return 0;
 }
 }
 
 
-#ifdef CONFIG_PM
 static int _tas_suspend(struct codec_info_item *cii, pm_message_t state)
 static int _tas_suspend(struct codec_info_item *cii, pm_message_t state)
 {
 {
 	return tas_suspend(cii->codec_data);
 	return tas_suspend(cii->codec_data);
@@ -778,7 +778,10 @@ static int _tas_resume(struct codec_info_item *cii)
 {
 {
 	return tas_resume(cii->codec_data);
 	return tas_resume(cii->codec_data);
 }
 }
-#endif
+#else /* CONFIG_PM */
+#define _tas_suspend	NULL
+#define _tas_resume	NULL
+#endif /* CONFIG_PM */
 
 
 static struct codec_info tas_codec_info = {
 static struct codec_info tas_codec_info = {
 	.transfers = tas_transfers,
 	.transfers = tas_transfers,
@@ -791,10 +794,8 @@ static struct codec_info tas_codec_info = {
 	.owner = THIS_MODULE,
 	.owner = THIS_MODULE,
 	.usable = tas_usable,
 	.usable = tas_usable,
 	.switch_clock = tas_switch_clock,
 	.switch_clock = tas_switch_clock,
-#ifdef CONFIG_PM
 	.suspend = _tas_suspend,
 	.suspend = _tas_suspend,
 	.resume = _tas_resume,
 	.resume = _tas_resume,
-#endif
 };
 };
 
 
 static int tas_init_codec(struct aoa_codec *codec)
 static int tas_init_codec(struct aoa_codec *codec)