diff options
-rw-r--r-- | sound/pci/asihpi/asihpi.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index ff9f9f1c0391..0e130dd8732e 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include "hpioctl.h" | 28 | #include "hpioctl.h" |
29 | #include "hpicmn.h" | 29 | #include "hpicmn.h" |
30 | 30 | ||
31 | |||
32 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
34 | #include <linux/jiffies.h> | 33 | #include <linux/jiffies.h> |
@@ -47,7 +46,7 @@ | |||
47 | 46 | ||
48 | MODULE_LICENSE("GPL"); | 47 | MODULE_LICENSE("GPL"); |
49 | MODULE_AUTHOR("AudioScience inc. <support@audioscience.com>"); | 48 | MODULE_AUTHOR("AudioScience inc. <support@audioscience.com>"); |
50 | MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx " | 49 | MODULE_DESCRIPTION("AudioScience ALSA ASI5xxx ASI6xxx ASI87xx ASI89xx " |
51 | HPI_VER_STRING); | 50 | HPI_VER_STRING); |
52 | 51 | ||
53 | #if defined CONFIG_SND_DEBUG_VERBOSE | 52 | #if defined CONFIG_SND_DEBUG_VERBOSE |
@@ -87,11 +86,11 @@ MODULE_PARM_DESC(enable_hpi_hwdep, | |||
87 | #ifdef KERNEL_ALSA_BUILD | 86 | #ifdef KERNEL_ALSA_BUILD |
88 | static char *build_info = "Built using headers from kernel source"; | 87 | static char *build_info = "Built using headers from kernel source"; |
89 | module_param(build_info, charp, S_IRUGO); | 88 | module_param(build_info, charp, S_IRUGO); |
90 | MODULE_PARM_DESC(build_info, "built using headers from kernel source"); | 89 | MODULE_PARM_DESC(build_info, "Built using headers from kernel source"); |
91 | #else | 90 | #else |
92 | static char *build_info = "Built within ALSA source"; | 91 | static char *build_info = "Built within ALSA source"; |
93 | module_param(build_info, charp, S_IRUGO); | 92 | module_param(build_info, charp, S_IRUGO); |
94 | MODULE_PARM_DESC(build_info, "built within ALSA source"); | 93 | MODULE_PARM_DESC(build_info, "Built within ALSA source"); |
95 | #endif | 94 | #endif |
96 | 95 | ||
97 | /* set to 1 to dump every control from adapter to log */ | 96 | /* set to 1 to dump every control from adapter to log */ |
@@ -538,7 +537,7 @@ static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream * | |||
538 | int expiry; | 537 | int expiry; |
539 | 538 | ||
540 | expiry = HZ / 200; | 539 | expiry = HZ / 200; |
541 | /*? (dpcm->period_bytes * HZ / dpcm->bytes_per_sec); */ | 540 | |
542 | expiry = max(expiry, 1); /* don't let it be zero! */ | 541 | expiry = max(expiry, 1); /* don't let it be zero! */ |
543 | dpcm->timer.expires = jiffies + expiry; | 542 | dpcm->timer.expires = jiffies + expiry; |
544 | dpcm->respawn_timer = 1; | 543 | dpcm->respawn_timer = 1; |
@@ -2932,10 +2931,6 @@ static struct pci_driver driver = { | |||
2932 | .id_table = asihpi_pci_tbl, | 2931 | .id_table = asihpi_pci_tbl, |
2933 | .probe = snd_asihpi_probe, | 2932 | .probe = snd_asihpi_probe, |
2934 | .remove = snd_asihpi_remove, | 2933 | .remove = snd_asihpi_remove, |
2935 | #ifdef CONFIG_PM_SLEEP | ||
2936 | /* .suspend = snd_asihpi_suspend, | ||
2937 | .resume = snd_asihpi_resume, */ | ||
2938 | #endif | ||
2939 | }; | 2934 | }; |
2940 | 2935 | ||
2941 | static int __init snd_asihpi_init(void) | 2936 | static int __init snd_asihpi_init(void) |