lkml.org 
[lkml]   [2010]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv6 11/16] pps: timestamp is always passed to dcd_change()
    Date
    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 <giometti@linux.it>
    Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
    ---
    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 <linux/fs.h>
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-12-17 20:57    [W:0.023 / U:0.752 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site