return 1;
}
-static int guswave_ioctl(int dev, unsigned int cmd, caddr_t arg)
+static int guswave_ioctl(int dev, unsigned int cmd, void __user *arg)
{
switch (cmd)
DMAbuf_close_dma(gus_devnum);
}
-static int guswave_load_patch(int dev, int format, const char *addr,
+static int guswave_load_patch(int dev, int format, const char __user *addr,
int offs, int count, int pmgr_flag)
{
struct patch_info patch;
for (i = 0; i < blk_sz; i++)
{
- get_user(*(unsigned char *) &data, (unsigned char *) &((addr)[sizeof_patch + i]));
+ get_user(*(unsigned char *) &data, (unsigned char __user *) &((addr)[sizeof_patch + i]));
if (patch.mode & WAVE_UNSIGNED)
if (!(patch.mode & WAVE_16_BITS) || (i & 0x01))
data ^= 0x80; /* Convert to signed */
return bits;
}
-static int gus_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
+static int gus_audio_ioctl(int dev, unsigned int cmd, void __user *arg)
{
int val;
switch (cmd)
{
case SOUND_PCM_WRITE_RATE:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int __user*)arg))
return -EFAULT;
val = gus_audio_set_speed(val);
break;
break;
case SNDCTL_DSP_STEREO:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int __user *)arg))
return -EFAULT;
val = gus_audio_set_channels(val + 1) - 1;
break;
case SOUND_PCM_WRITE_CHANNELS:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int __user *)arg))
return -EFAULT;
val = gus_audio_set_channels(val);
break;
break;
case SNDCTL_DSP_SETFMT:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int __user *)arg))
return -EFAULT;
val = gus_audio_set_bits(val);
break;
default:
return -EINVAL;
}
- return put_user(val, (int *)arg);
+ return put_user(val, (int __user *)arg);
}
static void gus_audio_reset(int dev)
#define MIX_DEVS (SOUND_MASK_MIC|SOUND_MASK_LINE| \
SOUND_MASK_SYNTH|SOUND_MASK_PCM)
-int gus_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
+int gus_default_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
{
int vol, val;
if (((cmd >> 8) & 0xff) != 'M')
return -EINVAL;
- if (!access_ok(VERIFY_WRITE, (int *)arg, sizeof(int)))
+ if (!access_ok(VERIFY_WRITE, arg, sizeof(int)))
return -EFAULT;
if (_SIOC_DIR(cmd) & _SIOC_WRITE)
{
- if (__get_user(val, (int *) arg))
+ if (__get_user(val, (int __user *) arg))
return -EFAULT;
switch (cmd & 0xff)
return -EINVAL;
}
}
- return __put_user(val, (int *)arg);
+ return __put_user(val, (int __user *)arg);
}
static struct mixer_operations gus_mixer_operations =