aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Sergeev <stsp@aknet.ru>2008-03-04 05:28:43 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:21 -0400
commita91605b86a234b01d2f99b38411ac30a40bdf067 (patch)
treeb87f7036e7903b32bd1aff3d5fe77f32ace352da
parent368c7a95ea324b3f9728ba1c901ac119d409bf4e (diff)
[ALSA] pcsp - clean ups
- make pcsp_start_timer_tasklet static - remove redundant includes. <asm/i8253.h> is not available on all platforms. Signed-off-by: Stas Sergeev <stsp@aknet.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/drivers/pcsp/pcsp.c2
-rw-r--r--sound/drivers/pcsp/pcsp_lib.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index 34477286b394..264d2a56dcd2 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -11,9 +11,7 @@
11#include <sound/core.h> 11#include <sound/core.h>
12#include <sound/initval.h> 12#include <sound/initval.h>
13#include <sound/pcm.h> 13#include <sound/pcm.h>
14
15#include <linux/input.h> 14#include <linux/input.h>
16#include <linux/delay.h>
17#include <asm/bitops.h> 15#include <asm/bitops.h>
18#include "pcsp_input.h" 16#include "pcsp_input.h"
19#include "pcsp.h" 17#include "pcsp.h"
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c
index 6bdcb89129d8..a302756eac7c 100644
--- a/sound/drivers/pcsp/pcsp_lib.c
+++ b/sound/drivers/pcsp/pcsp_lib.c
@@ -9,10 +9,8 @@
9#include <linux/module.h> 9#include <linux/module.h>
10#include <linux/moduleparam.h> 10#include <linux/moduleparam.h>
11#include <sound/pcm.h> 11#include <sound/pcm.h>
12#include <sound/pcm_params.h>
13#include <linux/interrupt.h> 12#include <linux/interrupt.h>
14#include <asm/io.h> 13#include <asm/io.h>
15#include <asm/i8253.h>
16#include "pcsp.h" 14#include "pcsp.h"
17 15
18static int nforce_wa; 16static int nforce_wa;
@@ -45,7 +43,7 @@ static void pcsp_start_timer(unsigned long dummy)
45 * The only solution I could find was to move the 43 * The only solution I could find was to move the
46 * hrtimer_start() into a tasklet. -stsp 44 * hrtimer_start() into a tasklet. -stsp
47 */ 45 */
48DECLARE_TASKLET(pcsp_start_timer_tasklet, pcsp_start_timer, 0); 46static DECLARE_TASKLET(pcsp_start_timer_tasklet, pcsp_start_timer, 0);
49 47
50enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) 48enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
51{ 49{