diff options
Diffstat (limited to 'sound/isa/sb/sb_common.c')
-rw-r--r-- | sound/isa/sb/sb_common.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index 603e923b5d2f..eb86b4456eef 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
@@ -41,7 +41,7 @@ MODULE_LICENSE("GPL"); | |||
41 | 41 | ||
42 | #undef IO_DEBUG | 42 | #undef IO_DEBUG |
43 | 43 | ||
44 | int snd_sbdsp_command(sb_t *chip, unsigned char val) | 44 | int snd_sbdsp_command(struct snd_sb *chip, unsigned char val) |
45 | { | 45 | { |
46 | int i; | 46 | int i; |
47 | #ifdef IO_DEBUG | 47 | #ifdef IO_DEBUG |
@@ -56,7 +56,7 @@ int snd_sbdsp_command(sb_t *chip, unsigned char val) | |||
56 | return 0; | 56 | return 0; |
57 | } | 57 | } |
58 | 58 | ||
59 | int snd_sbdsp_get_byte(sb_t *chip) | 59 | int snd_sbdsp_get_byte(struct snd_sb *chip) |
60 | { | 60 | { |
61 | int val; | 61 | int val; |
62 | int i; | 62 | int i; |
@@ -73,7 +73,7 @@ int snd_sbdsp_get_byte(sb_t *chip) | |||
73 | return -ENODEV; | 73 | return -ENODEV; |
74 | } | 74 | } |
75 | 75 | ||
76 | int snd_sbdsp_reset(sb_t *chip) | 76 | int snd_sbdsp_reset(struct snd_sb *chip) |
77 | { | 77 | { |
78 | int i; | 78 | int i; |
79 | 79 | ||
@@ -92,7 +92,7 @@ int snd_sbdsp_reset(sb_t *chip) | |||
92 | return -ENODEV; | 92 | return -ENODEV; |
93 | } | 93 | } |
94 | 94 | ||
95 | static int snd_sbdsp_version(sb_t * chip) | 95 | static int snd_sbdsp_version(struct snd_sb * chip) |
96 | { | 96 | { |
97 | unsigned int result = -ENODEV; | 97 | unsigned int result = -ENODEV; |
98 | 98 | ||
@@ -102,7 +102,7 @@ static int snd_sbdsp_version(sb_t * chip) | |||
102 | return result; | 102 | return result; |
103 | } | 103 | } |
104 | 104 | ||
105 | static int snd_sbdsp_probe(sb_t * chip) | 105 | static int snd_sbdsp_probe(struct snd_sb * chip) |
106 | { | 106 | { |
107 | int version; | 107 | int version; |
108 | int major, minor; | 108 | int major, minor; |
@@ -176,7 +176,7 @@ static int snd_sbdsp_probe(sb_t * chip) | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | 178 | ||
179 | static int snd_sbdsp_free(sb_t *chip) | 179 | static int snd_sbdsp_free(struct snd_sb *chip) |
180 | { | 180 | { |
181 | if (chip->res_port) | 181 | if (chip->res_port) |
182 | release_and_free_resource(chip->res_port); | 182 | release_and_free_resource(chip->res_port); |
@@ -196,24 +196,24 @@ static int snd_sbdsp_free(sb_t *chip) | |||
196 | return 0; | 196 | return 0; |
197 | } | 197 | } |
198 | 198 | ||
199 | static int snd_sbdsp_dev_free(snd_device_t *device) | 199 | static int snd_sbdsp_dev_free(struct snd_device *device) |
200 | { | 200 | { |
201 | sb_t *chip = device->device_data; | 201 | struct snd_sb *chip = device->device_data; |
202 | return snd_sbdsp_free(chip); | 202 | return snd_sbdsp_free(chip); |
203 | } | 203 | } |
204 | 204 | ||
205 | int snd_sbdsp_create(snd_card_t *card, | 205 | int snd_sbdsp_create(struct snd_card *card, |
206 | unsigned long port, | 206 | unsigned long port, |
207 | int irq, | 207 | int irq, |
208 | irqreturn_t (*irq_handler)(int, void *, struct pt_regs *), | 208 | irqreturn_t (*irq_handler)(int, void *, struct pt_regs *), |
209 | int dma8, | 209 | int dma8, |
210 | int dma16, | 210 | int dma16, |
211 | unsigned short hardware, | 211 | unsigned short hardware, |
212 | sb_t **r_chip) | 212 | struct snd_sb **r_chip) |
213 | { | 213 | { |
214 | sb_t *chip; | 214 | struct snd_sb *chip; |
215 | int err; | 215 | int err; |
216 | static snd_device_ops_t ops = { | 216 | static struct snd_device_ops ops = { |
217 | .dev_free = snd_sbdsp_dev_free, | 217 | .dev_free = snd_sbdsp_dev_free, |
218 | }; | 218 | }; |
219 | 219 | ||