git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
isa
/
gus
/
gus_mem_proc.c
diff --git
a/sound/isa/gus/gus_mem_proc.c
b/sound/isa/gus/gus_mem_proc.c
index
886763f
..
80f0a83
100644
(file)
--- a/
sound/isa/gus/gus_mem_proc.c
+++ b/
sound/isa/gus/gus_mem_proc.c
@@
-25,20
+25,20
@@
#include <sound/gus.h>
#include <sound/info.h>
#include <sound/gus.h>
#include <sound/info.h>
-
typedef
struct gus_proc_private {
+struct gus_proc_private {
int rom; /* data are in ROM */
unsigned int address;
unsigned int size;
int rom; /* data are in ROM */
unsigned int address;
unsigned int size;
- s
nd_gus_card_t
* gus;
-}
gus_proc_private_t
;
+ s
truct snd_gus_card
* gus;
+};
-static long snd_gf1_mem_proc_dump(s
nd_info_entry_t
*entry, void *file_private_data,
+static long snd_gf1_mem_proc_dump(s
truct snd_info_entry
*entry, void *file_private_data,
struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{
long size;
struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{
long size;
-
gus_proc_private_t
*priv = entry->private_data;
- s
nd_gus_card_t
*gus = priv->gus;
+
struct gus_proc_private
*priv = entry->private_data;
+ s
truct snd_gus_card
*gus = priv->gus;
int err;
size = count;
int err;
size = count;
@@
-52,22
+52,22
@@
static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_da
return 0;
}
return 0;
}
-static long long snd_gf1_mem_proc_llseek(s
nd_info_entry_t
*entry,
+static long long snd_gf1_mem_proc_llseek(s
truct snd_info_entry
*entry,
void *private_file_data,
struct file *file,
long long offset,
int orig)
{
void *private_file_data,
struct file *file,
long long offset,
int orig)
{
-
gus_proc_private_t
*priv = entry->private_data;
+
struct gus_proc_private
*priv = entry->private_data;
switch (orig) {
switch (orig) {
- case
0: /* SEEK_SET */
+ case
SEEK_SET:
file->f_pos = offset;
break;
file->f_pos = offset;
break;
- case
1: /* SEEK_CUR */
+ case
SEEK_CUR:
file->f_pos += offset;
break;
file->f_pos += offset;
break;
- case
2: /* SEEK_END,
offset is negative */
+ case
SEEK_END: /*
offset is negative */
file->f_pos = priv->size + offset;
break;
default:
file->f_pos = priv->size + offset;
break;
default:
@@
-78,9
+78,9
@@
static long long snd_gf1_mem_proc_llseek(snd_info_entry_t *entry,
return file->f_pos;
}
return file->f_pos;
}
-static void snd_gf1_mem_proc_free(s
nd_info_entry_t
*entry)
+static void snd_gf1_mem_proc_free(s
truct snd_info_entry
*entry)
{
{
-
gus_proc_private_t
*priv = entry->private_data;
+
struct gus_proc_private
*priv = entry->private_data;
kfree(priv);
}
kfree(priv);
}
@@
-89,16
+89,16
@@
static struct snd_info_entry_ops snd_gf1_mem_proc_ops = {
.llseek = snd_gf1_mem_proc_llseek,
};
.llseek = snd_gf1_mem_proc_llseek,
};
-int snd_gf1_mem_proc_init(s
nd_gus_card_t
* gus)
+int snd_gf1_mem_proc_init(s
truct snd_gus_card
* gus)
{
int idx;
char name[16];
{
int idx;
char name[16];
-
gus_proc_private_t
*priv;
- s
nd_info_entry_t
*entry;
+
struct gus_proc_private
*priv;
+ s
truct snd_info_entry
*entry;
for (idx = 0; idx < 4; idx++) {
if (gus->gf1.mem_alloc.banks_8[idx].size > 0) {
for (idx = 0; idx < 4; idx++) {
if (gus->gf1.mem_alloc.banks_8[idx].size > 0) {
- priv = k
calloc(1,
sizeof(*priv), GFP_KERNEL);
+ priv = k
zalloc(
sizeof(*priv), GFP_KERNEL);
if (priv == NULL)
return -ENOMEM;
priv->gus = gus;
if (priv == NULL)
return -ENOMEM;
priv->gus = gus;
@@
-115,7
+115,7
@@
int snd_gf1_mem_proc_init(snd_gus_card_t * gus)
}
for (idx = 0; idx < 4; idx++) {
if (gus->gf1.rom_present & (1 << idx)) {
}
for (idx = 0; idx < 4; idx++) {
if (gus->gf1.rom_present & (1 << idx)) {
- priv = k
calloc(1,
sizeof(*priv), GFP_KERNEL);
+ priv = k
zalloc(
sizeof(*priv), GFP_KERNEL);
if (priv == NULL)
return -ENOMEM;
priv->rom = 1;
if (priv == NULL)
return -ENOMEM;
priv->rom = 1;