Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593fb1ae authored by George Spelvin's avatar George Spelvin Committed by Greg Kroah-Hartman
Browse files

pps: Move timestamp read into PPS code proper 



The PPS (Pulse-Per-Second) line discipline has developed a number of
unhealthy attachments to core tty data and functions, ultimately leading
to its breakage.

The previous patches fixed the crashing.  This one reduces coupling further
by eliminating the timestamp parameter from the dcd_change ldisc method.
This reduces header file linkage and makes the extension more generic,
and the timestamp read is delayed only slightly, from just before the
ldisc->ops->dcd_change method call to just after.

Fix attendant build breakage in
    drivers/tty/n_tty.c
    drivers/tty/tty_buffer.c
    drivers/staging/speakup/selection.c
    drivers/staging/dgrp/dgrp_*.c

Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Chris Brannon <chris@the-brannons.com>
Cc: Kirk Reiser <kirk@braille.uwo.ca>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGeorge Spelvin <linux@horizon.com>
Acked-by: default avatarRodolfo Giometti <giometti@enneenne.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce3da1a6

drivers/pps/clients/pps-ldisc.c

+7 −4
Original line number Diff line number Diff line
@@ -29,11 +29,14 @@ 


#define PPS_TTY_MAGIC		0x0001



static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,

				struct pps_event_time *ts)

static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status)

{

	struct pps_device *pps = pps_lookup_dev(tty);

	struct pps_device *pps;

	struct pps_event_time ts;



	pps_get_ts(&ts);



	pps = pps_lookup_dev(tty);

	/*

	 * This should never fail, but the ldisc locking is very

	 * convoluted, so don't crash just in case.
@@ -42,7 +45,7 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status, 
		return;



	/* Now do the PPS event report */

	pps_event(pps, ts, status ? PPS_CAPTUREASSERT :

	pps_event(pps, &ts, status ? PPS_CAPTUREASSERT :

			PPS_CAPTURECLEAR, NULL);



	dev_dbg(pps->dev, "PPS %s at %lu\n",

drivers/staging/dgrp/dgrp_net_ops.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/proc_fs.h>

#include <linux/types.h>

#include <linux/string.h>

#include <linux/device.h>

#include <linux/tty.h>

#include <linux/tty_flip.h>

#include <linux/spinlock.h>

drivers/staging/dgrp/dgrp_tty.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/slab.h>

#include <linux/tty.h>

#include <linux/tty_flip.h>

#include <linux/device.h>

#include <linux/sched.h>

#include <linux/uaccess.h>

drivers/staging/speakup/selection.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/consolemap.h>

#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/device.h> /* for dev_warn */

#include <linux/selection.h>



#include "speakup.h"

drivers/tty/n_tty.c

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/file.h>

#include <linux/uaccess.h>

#include <linux/module.h>

#include <linux/ratelimit.h>





/* number of characters left in xmit buffer before select has we have room */
@@ -2188,7 +2189,7 @@ struct tty_ldisc_ops tty_ldisc_N_TTY = { 
 *	n_tty_inherit_ops	-	inherit N_TTY methods

 *	@ops: struct tty_ldisc_ops where to save N_TTY methods

 *

 *	Used by a generic struct tty_ldisc_ops to easily inherit N_TTY

 *	Enables a 'subclass' line discipline to 'inherit' N_TTY

 *	methods.

 */