|
@@ -31,7 +31,7 @@
|
|
|
static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
|
|
|
struct pps_event_time *ts)
|
|
|
{
|
|
|
- struct pps_device *pps = (struct pps_device *)tty->disc_data;
|
|
|
+ struct pps_device *pps = pps_lookup_dev(tty);
|
|
|
|
|
|
BUG_ON(pps == NULL);
|
|
|
|
|
@@ -67,9 +67,9 @@ static int pps_tty_open(struct tty_struct *tty)
|
|
|
pr_err("cannot register PPS source \"%s\"\n", info.path);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
- tty->disc_data = pps;
|
|
|
+ pps->lookup_cookie = tty;
|
|
|
|
|
|
- /* Should open N_TTY ldisc too */
|
|
|
+ /* Now open the base class N_TTY ldisc */
|
|
|
ret = alias_n_tty_open(tty);
|
|
|
if (ret < 0) {
|
|
|
pr_err("cannot open tty ldisc \"%s\"\n", info.path);
|
|
@@ -81,7 +81,6 @@ static int pps_tty_open(struct tty_struct *tty)
|
|
|
return 0;
|
|
|
|
|
|
err_unregister:
|
|
|
- tty->disc_data = NULL;
|
|
|
pps_unregister_source(pps);
|
|
|
return ret;
|
|
|
}
|
|
@@ -90,11 +89,10 @@ static void (*alias_n_tty_close)(struct tty_struct *tty);
|
|
|
|
|
|
static void pps_tty_close(struct tty_struct *tty)
|
|
|
{
|
|
|
- struct pps_device *pps = (struct pps_device *)tty->disc_data;
|
|
|
+ struct pps_device *pps = pps_lookup_dev(tty);
|
|
|
|
|
|
alias_n_tty_close(tty);
|
|
|
|
|
|
- tty->disc_data = NULL;
|
|
|
dev_info(pps->dev, "removed\n");
|
|
|
pps_unregister_source(pps);
|
|
|
}
|