diff options
Diffstat (limited to 'sound/oss/dmasound')
-rw-r--r-- | sound/oss/dmasound/Kconfig | 2 | ||||
-rw-r--r-- | sound/oss/dmasound/dac3550a.c | 3 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_core.c | 6 | ||||
-rw-r--r-- | sound/oss/dmasound/tas3001c.c | 3 | ||||
-rw-r--r-- | sound/oss/dmasound/tas3004.c | 3 | ||||
-rw-r--r-- | sound/oss/dmasound/tas_common.c | 3 |
6 files changed, 8 insertions, 12 deletions
diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig index cb845580fe0..18e149f52a8 100644 --- a/sound/oss/dmasound/Kconfig +++ b/sound/oss/dmasound/Kconfig @@ -14,7 +14,7 @@ config DMASOUND_ATARI config DMASOUND_PMAC tristate "PowerMac DMA sound support" - depends on PPC32 && PPC_PMAC && SOUND && I2C + depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS select DMASOUND help If you want to use the internal audio of your PowerMac in Linux, diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c index 7360d8954d6..0f0d03a55da 100644 --- a/sound/oss/dmasound/dac3550a.c +++ b/sound/oss/dmasound/dac3550a.c @@ -163,10 +163,9 @@ static int daca_detect_client(struct i2c_adapter *adapter, int address) struct i2c_client *new_client; int rc = -ENODEV; - new_client = kmalloc(sizeof(*new_client), GFP_KERNEL); + new_client = kzalloc(sizeof(*new_client), GFP_KERNEL); if (!new_client) return -ENOMEM; - memset(new_client, 0, sizeof(*new_client)); new_client->addr = address; new_client->adapter = adapter; diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index 80b836e80d9..a0ec886f2aa 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -371,7 +371,7 @@ static int mixer_ioctl(struct inode *inode, struct file *file, u_int cmd, return -EINVAL; } -static struct file_operations mixer_fops = +static const struct file_operations mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, @@ -1337,7 +1337,7 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd, return -EINVAL; } -static struct file_operations sq_fops = +static const struct file_operations sq_fops = { .owner = THIS_MODULE, .llseek = no_llseek, @@ -1561,7 +1561,7 @@ static ssize_t state_read(struct file *file, char __user *buf, size_t count, return n; } -static struct file_operations state_fops = { +static const struct file_operations state_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = state_read, diff --git a/sound/oss/dmasound/tas3001c.c b/sound/oss/dmasound/tas3001c.c index 2f21a3c0037..4b7dbdd2a43 100644 --- a/sound/oss/dmasound/tas3001c.c +++ b/sound/oss/dmasound/tas3001c.c @@ -807,10 +807,9 @@ tas3001c_init(struct i2c_client *client) size_t sz = sizeof(*self) + (TAS3001C_REG_MAX*sizeof(tas_shadow_t)); int i, j; - self = kmalloc(sz, GFP_KERNEL); + self = kzalloc(sz, GFP_KERNEL); if (!self) return -ENOMEM; - memset(self, 0, sz); self->super.client = client; self->super.shadow = (tas_shadow_t *)(self+1); diff --git a/sound/oss/dmasound/tas3004.c b/sound/oss/dmasound/tas3004.c index af34fb39bc2..678bf0ff6da 100644 --- a/sound/oss/dmasound/tas3004.c +++ b/sound/oss/dmasound/tas3004.c @@ -1092,10 +1092,9 @@ tas3004_init(struct i2c_client *client) char mcr2 = 0; int i, j; - self = kmalloc(sz, GFP_KERNEL); + self = kzalloc(sz, GFP_KERNEL); if (!self) return -ENOMEM; - memset(self, 0, sz); self->super.client = client; self->super.shadow = (tas_shadow_t *)(self+1); diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 882ae98a41b..665e85b5562 100644 --- a/sound/oss/dmasound/tas_common.c +++ b/sound/oss/dmasound/tas_common.c @@ -135,10 +135,9 @@ tas_detect_client(struct i2c_adapter *adapter, int address) return -ENODEV; } - new_client = kmalloc(sizeof(*new_client), GFP_KERNEL); + new_client = kzalloc(sizeof(*new_client), GFP_KERNEL); if (!new_client) return -ENOMEM; - memset(new_client, 0, sizeof(*new_client)); new_client->addr = address; new_client->adapter = adapter; |