Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755772Ab0LQTz3 (ORCPT ); Fri, 17 Dec 2010 14:55:29 -0500 Received: from gate.lvk.cs.msu.su ([158.250.17.1]:58335 "EHLO mail.lvk.cs.msu.su" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754641Ab0LQTz0 (ORCPT ); Fri, 17 Dec 2010 14:55:26 -0500 X-Spam-ASN: From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: "Nikita V\. Youshchenko" , linuxpps@ml.enneenne.com, Rodolfo Giometti , Andrew Morton , Alexander Gordeev , Randy Dunlap , linux-doc@vger.kernel.org Subject: [PATCHv6 11/16] pps: timestamp is always passed to dcd_change() Date: Fri, 17 Dec 2010 22:54:35 +0300 Message-Id: X-Mailer: git-send-email 1.7.2.3 In-Reply-To: References: X-AV-Checked: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2184 Lines: 65 Remove the code that gatheres timestamp in pps_tty_dcd_change() in case passed ts parameter is NULL because it never happens in the current code. Fix comments as well. Acked-by: Rodolfo Giometti Signed-off-by: Alexander Gordeev --- Documentation/serial/tty.txt | 2 +- drivers/pps/clients/pps-ldisc.c | 8 -------- include/linux/tty_ldisc.h | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.txt index 7c90050..540db41 100644 --- a/Documentation/serial/tty.txt +++ b/Documentation/serial/tty.txt @@ -107,7 +107,7 @@ write_wakeup() - May be called at any point between open and close. dcd_change() - Report to the tty line the current DCD pin status changes and the relative timestamp. The timestamp - can be NULL. + cannot be NULL. Driver Access diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c index 1b3c6ed..79451f2 100644 --- a/drivers/pps/clients/pps-ldisc.c +++ b/drivers/pps/clients/pps-ldisc.c @@ -32,14 +32,6 @@ 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_event_time __ts; - - /* First of all we get the time stamp... */ - pps_get_ts(&__ts); - - /* Does caller give us a timestamp? */ - if (!ts) /* No. Do it ourself! */ - ts = &__ts; BUG_ON(pps == NULL); diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h index 763e061..ff7dc08 100644 --- a/include/linux/tty_ldisc.h +++ b/include/linux/tty_ldisc.h @@ -104,7 +104,7 @@ * struct pps_event_time *ts) * * Tells the discipline that the DCD pin has changed its status and - * the relative timestamp. Pointer ts can be NULL. + * the relative timestamp. Pointer ts cannot be NULL. */ #include -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/