{
unsigned int retval = 0;
pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;
+ void __user *arg = (void __user *)ioarg;
PRINTK_5(TRACE_MWAVE,
"mwavedd::mwave_ioctl, entry inode %x file %x cmd %x arg %x\n",
" retval %x from tp3780I_QueryAbilities\n",
retval);
if (retval == 0) {
- if( copy_to_user((char *) ioarg,
- (char *) &rAbilities,
+ if( copy_to_user(arg, &rAbilities,
sizeof(MW_ABILITIES)) )
return -EFAULT;
}
case IOCTL_MW_READ_DATA:
case IOCTL_MW_READCLEAR_DATA: {
MW_READWRITE rReadData;
- unsigned short *pusBuffer = 0;
+ unsigned short __user *pusBuffer = 0;
- if( copy_from_user((char *) &rReadData,
- (char *) ioarg,
+ if( copy_from_user(&rReadData, arg,
sizeof(MW_READWRITE)) )
return -EFAULT;
- pusBuffer = (unsigned short *) (rReadData.pBuf);
+ pusBuffer = (unsigned short __user *) (rReadData.pBuf);
PRINTK_4(TRACE_MWAVE,
"mwavedd::mwave_ioctl IOCTL_MW_READ_DATA,"
rReadData.ulDataLength, ioarg, pusBuffer);
retval = tp3780I_ReadWriteDspDStore(&pDrvData->rBDData,
iocmd,
- (void *) pusBuffer,
+ pusBuffer,
rReadData.ulDataLength,
rReadData.usDspAddress);
}
case IOCTL_MW_READ_INST: {
MW_READWRITE rReadData;
- unsigned short *pusBuffer = 0;
+ unsigned short __user *pusBuffer = 0;
- if( copy_from_user((char *) &rReadData, (char *) ioarg,
+ if( copy_from_user(&rReadData, arg,
sizeof(MW_READWRITE)) )
return -EFAULT;
- pusBuffer = (unsigned short *) (rReadData.pBuf);
+ pusBuffer = (unsigned short __user *) (rReadData.pBuf);
PRINTK_4(TRACE_MWAVE,
"mwavedd::mwave_ioctl IOCTL_MW_READ_INST,"
case IOCTL_MW_WRITE_DATA: {
MW_READWRITE rWriteData;
- unsigned short *pusBuffer = 0;
+ unsigned short __user *pusBuffer = 0;
- if( copy_from_user((char *) &rWriteData,
- (char *) ioarg,
+ if( copy_from_user(&rWriteData, arg,
sizeof(MW_READWRITE)) )
return -EFAULT;
- pusBuffer = (unsigned short *) (rWriteData.pBuf);
+ pusBuffer = (unsigned short __user *) (rWriteData.pBuf);
PRINTK_4(TRACE_MWAVE,
"mwavedd::mwave_ioctl IOCTL_MW_WRITE_DATA,"
case IOCTL_MW_WRITE_INST: {
MW_READWRITE rWriteData;
- unsigned short *pusBuffer = 0;
+ unsigned short __user *pusBuffer = 0;
- if( copy_from_user((char *) &rWriteData,
- (char *) ioarg,
+ if( copy_from_user(&rWriteData, arg,
sizeof(MW_READWRITE)) )
return -EFAULT;
- pusBuffer = (unsigned short *) (rWriteData.pBuf);
+ pusBuffer = (unsigned short __user *)(rWriteData.pBuf);
PRINTK_4(TRACE_MWAVE,
"mwavedd::mwave_ioctl IOCTL_MW_WRITE_INST,"
}
-static ssize_t mwave_read(struct file *file, char *buf, size_t count,
+static ssize_t mwave_read(struct file *file, char __user *buf, size_t count,
loff_t * ppos)
{
PRINTK_5(TRACE_MWAVE,
}
-static ssize_t mwave_write(struct file *file, const char *buf,
+static ssize_t mwave_write(struct file *file, const char __user *buf,
size_t count, loff_t * ppos)
{
PRINTK_5(TRACE_MWAVE,
static struct miscdevice mwave_misc_dev = { MWAVE_MINOR, "mwave", &mwave_fops };
+#if 0 /* totally b0rked */
/*
* sysfs support <paulsch@us.ibm.com>
*/
&dev_attr_uart_irq,
&dev_attr_uart_io,
};
+#endif
/*
* mwave_init is called on module load
*/
static void mwave_exit(void)
{
- int i;
pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;
PRINTK_1(TRACE_MWAVE, "mwavedd::mwave_exit entry\n");
+#if 0
for (i = 0; i < pDrvData->nr_registered_attrs; i++)
device_remove_file(&mwave_device, mwave_dev_attrs[i]);
pDrvData->nr_registered_attrs = 0;
device_unregister(&mwave_device);
pDrvData->device_registered = FALSE;
}
+#endif
if ( pDrvData->sLine >= 0 ) {
unregister_serial(pDrvData->sLine);
}
/* uart is registered */
+#if 0
/* sysfs */
memset(&mwave_device, 0, sizeof (struct device));
snprintf(mwave_device.bus_id, BUS_ID_SIZE, "mwave");
}
pDrvData->nr_registered_attrs++;
}
+#endif
/* SUCCESS! */
return 0;