aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-09-29 05:00:16 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:13 -0400
commitaadcc2eef70640302805a6bb8c0f2a485779eea3 (patch)
tree48cc2605278076964e233d9dc7d3caf260de424f
parent7dd7d6912b8a978878847fdcd3feef0d1b6471de (diff)
[PATCH] CONFIG_PM=n slim: sound/oss/trident.c
Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Ackde-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/oss/trident.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 2813e4c8e365..d4844de0c3b7 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -488,10 +488,6 @@ static void ali_set_spdif_out_rate(struct trident_card *card, unsigned int rate)
488static void ali_enable_special_channel(struct trident_state *stat); 488static void ali_enable_special_channel(struct trident_state *stat);
489static struct trident_channel *ali_alloc_rec_pcm_channel(struct trident_card *card); 489static struct trident_channel *ali_alloc_rec_pcm_channel(struct trident_card *card);
490static struct trident_channel *ali_alloc_pcm_channel(struct trident_card *card); 490static struct trident_channel *ali_alloc_pcm_channel(struct trident_card *card);
491static void ali_restore_regs(struct trident_card *card);
492static void ali_save_regs(struct trident_card *card);
493static int trident_suspend(struct pci_dev *dev, pm_message_t unused);
494static int trident_resume(struct pci_dev *dev);
495static void ali_free_pcm_channel(struct trident_card *card, unsigned int channel); 491static void ali_free_pcm_channel(struct trident_card *card, unsigned int channel);
496static int ali_setup_multi_channels(struct trident_card *card, int chan_nums); 492static int ali_setup_multi_channels(struct trident_card *card, int chan_nums);
497static unsigned int ali_get_spdif_in_rate(struct trident_card *card); 493static unsigned int ali_get_spdif_in_rate(struct trident_card *card);
@@ -507,13 +503,6 @@ static int ali_allocate_other_states_resources(struct trident_state *state,
507 int chan_nums); 503 int chan_nums);
508static void ali_free_other_states_resources(struct trident_state *state); 504static void ali_free_other_states_resources(struct trident_state *state);
509 505
510/* save registers for ALi Power Management */
511static struct ali_saved_registers {
512 unsigned long global_regs[ALI_GLOBAL_REGS];
513 unsigned long channel_regs[ALI_CHANNELS][ALI_CHANNEL_REGS];
514 unsigned mixer_regs[ALI_MIXER_REGS];
515} ali_registers;
516
517#define seek_offset(dma_ptr, buffer, cnt, offset, copy_count) do { \ 506#define seek_offset(dma_ptr, buffer, cnt, offset, copy_count) do { \
518 (dma_ptr) += (offset); \ 507 (dma_ptr) += (offset); \
519 (buffer) += (offset); \ 508 (buffer) += (offset); \
@@ -3653,6 +3642,14 @@ ali_allocate_other_states_resources(struct trident_state *state, int chan_nums)
3653 return 0; 3642 return 0;
3654} 3643}
3655 3644
3645#ifdef CONFIG_PM
3646/* save registers for ALi Power Management */
3647static struct ali_saved_registers {
3648 unsigned long global_regs[ALI_GLOBAL_REGS];
3649 unsigned long channel_regs[ALI_CHANNELS][ALI_CHANNEL_REGS];
3650 unsigned mixer_regs[ALI_MIXER_REGS];
3651} ali_registers;
3652
3656static void 3653static void
3657ali_save_regs(struct trident_card *card) 3654ali_save_regs(struct trident_card *card)
3658{ 3655{
@@ -3746,6 +3743,7 @@ trident_resume(struct pci_dev *dev)
3746 } 3743 }
3747 return 0; 3744 return 0;
3748} 3745}
3746#endif
3749 3747
3750static struct trident_channel * 3748static struct trident_channel *
3751ali_alloc_pcm_channel(struct trident_card *card) 3749ali_alloc_pcm_channel(struct trident_card *card)
@@ -4616,8 +4614,10 @@ static struct pci_driver trident_pci_driver = {
4616 .id_table = trident_pci_tbl, 4614 .id_table = trident_pci_tbl,
4617 .probe = trident_probe, 4615 .probe = trident_probe,
4618 .remove = __devexit_p(trident_remove), 4616 .remove = __devexit_p(trident_remove),
4617#ifdef CONFIG_PM
4619 .suspend = trident_suspend, 4618 .suspend = trident_suspend,
4620 .resume = trident_resume 4619 .resume = trident_resume
4620#endif
4621}; 4621};
4622 4622
4623static int __init 4623static int __init