tty = priv->tty;
if (tty->driver->wait_until_sent) {
lock_kernel();
- tty->driver->wait_until_sent(tty, MSECS_TO_JIFFIES(100));
+ tty->driver->wait_until_sent(tty, msecs_to_jiffies(100));
unlock_kernel();
}
else {
set_task_state(current, TASK_UNINTERRUPTIBLE);
- schedule_timeout(MSECS_TO_JIFFIES(USBSERIAL_TX_DONE_DELAY));
+ schedule_timeout(msecs_to_jiffies(USBSERIAL_TX_DONE_DELAY));
}
}
struct irtty_info { char name[6]; } info;
struct sir_dev *dev;
struct sirtty_cb *priv = tty->disc_data;
- int size = _IOC_SIZE(cmd);
int err = 0;
ASSERT(priv != NULL, return -ENODEV;);
dev = priv->dev;
ASSERT(dev != NULL, return -1;);
- if (_IOC_DIR(cmd) & _IOC_READ)
- err = verify_area(VERIFY_WRITE, (void *) arg, size);
- else if (_IOC_DIR(cmd) & _IOC_WRITE)
- err = verify_area(VERIFY_READ, (void *) arg, size);
- if (err)
- return err;
-
switch (cmd) {
case TCGETS:
case TCGETA:
memset(&info, 0, sizeof(info));
strncpy(info.name, dev->netdev->name, sizeof(info.name)-1);
- if (copy_to_user((void *)arg, &info, sizeof(info)))
+ if (copy_to_user((void __user *)arg, &info, sizeof(info)))
err = -EFAULT;
break;
default:
if (tty->driver->flush_buffer)
tty->driver->flush_buffer(tty);
-/* from old irtty - but what is it good for?
- * we _are_ the ldisc and we _don't_ implement flush_buffer!
- *
- * if (tty->ldisc.flush_buffer)
- * tty->ldisc.flush_buffer(tty);
- */
-
/* apply mtt override */
sir_tty_drv.qos_mtt_bits = qos_mtt_bits;
*/
/* we are dead now */
- tty->disc_data = 0;
+ tty->disc_data = NULL;
sirdev_put_instance(priv->dev);