aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2009-02-25 18:51:40 -0500
committerIngo Molnar <mingo@elte.hu>2009-03-26 13:14:15 -0400
commit9adfbfb611307060db54691bc7e6d53fdc12312b (patch)
tree35d2fb021c0a4e8d2980af114363bff714301aae /include/sound
parent85efde6f4e0de9577256c5f0030088d3fd4347c1 (diff)
make most exported headers use strict integer types
This takes care of all files that have only a small number of non-strict integer type uses. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: David Airlie <airlied@linux.ie> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Cc: netdev@vger.kernel.org Cc: linux-ppp@vger.kernel.org Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/asound.h5
-rw-r--r--include/sound/emu10k1.h12
2 files changed, 11 insertions, 6 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 16684c5a608c..d9beda5f74a7 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -23,9 +23,10 @@
23#ifndef __SOUND_ASOUND_H 23#ifndef __SOUND_ASOUND_H
24#define __SOUND_ASOUND_H 24#define __SOUND_ASOUND_H
25 25
26#include <linux/types.h>
27
26#ifdef __KERNEL__ 28#ifdef __KERNEL__
27#include <linux/ioctl.h> 29#include <linux/ioctl.h>
28#include <linux/types.h>
29#include <linux/time.h> 30#include <linux/time.h>
30#include <asm/byteorder.h> 31#include <asm/byteorder.h>
31 32
@@ -342,7 +343,7 @@ struct snd_interval {
342#define SNDRV_MASK_MAX 256 343#define SNDRV_MASK_MAX 256
343 344
344struct snd_mask { 345struct snd_mask {
345 u_int32_t bits[(SNDRV_MASK_MAX+31)/32]; 346 __u32 bits[(SNDRV_MASK_MAX+31)/32];
346}; 347};
347 348
348struct snd_pcm_hw_params { 349struct snd_pcm_hw_params {
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 10ee28eac018..c380056ff26d 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1,6 +1,8 @@
1#ifndef __SOUND_EMU10K1_H 1#ifndef __SOUND_EMU10K1_H
2#define __SOUND_EMU10K1_H 2#define __SOUND_EMU10K1_H
3 3
4#include <linux/types.h>
5
4/* 6/*
5 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>, 7 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
6 * Creative Labs, Inc. 8 * Creative Labs, Inc.
@@ -34,6 +36,8 @@
34#include <sound/timer.h> 36#include <sound/timer.h>
35#include <linux/interrupt.h> 37#include <linux/interrupt.h>
36#include <linux/mutex.h> 38#include <linux/mutex.h>
39#include <linux/types.h>
40
37#include <asm/io.h> 41#include <asm/io.h>
38 42
39/* ------------------- DEFINES -------------------- */ 43/* ------------------- DEFINES -------------------- */
@@ -2171,7 +2175,7 @@ struct snd_emu10k1_fx8010_code {
2171 char name[128]; 2175 char name[128];
2172 2176
2173 DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ 2177 DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
2174 u_int32_t __user *gpr_map; /* initializers */ 2178 __u32 __user *gpr_map; /* initializers */
2175 2179
2176 unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ 2180 unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
2177 struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */ 2181 struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */
@@ -2184,11 +2188,11 @@ struct snd_emu10k1_fx8010_code {
2184 struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ 2188 struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */
2185 2189
2186 DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ 2190 DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
2187 u_int32_t __user *tram_data_map; /* data initializers */ 2191 __u32 __user *tram_data_map; /* data initializers */
2188 u_int32_t __user *tram_addr_map; /* map initializers */ 2192 __u32 __user *tram_addr_map; /* map initializers */
2189 2193
2190 DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ 2194 DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
2191 u_int32_t __user *code; /* one instruction - 64 bits */ 2195 __u32 __user *code; /* one instruction - 64 bits */
2192}; 2196};
2193 2197
2194struct snd_emu10k1_fx8010_tram { 2198struct snd_emu10k1_fx8010_tram {