lkml.org 
[lkml]   [2018]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] ntp: Remove redundant arguments
    Date
    From: Ondrej Mosnacek <omosnace@redhat.com>

    The 'ts' argument of process_adj_status() and process_adjtimex_modes()
    is unused and can be safely removed.

    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Miroslav Lichvar <mlichvar@redhat.com>
    Cc: Richard Cochran <richardcochran@gmail.com>
    Cc: Prarit Bhargava <prarit@redhat.com>
    Cc: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    ---
    kernel/time/ntp.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
    index 10a7905..3eddac2 100644
    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -642,7 +642,7 @@ void ntp_notify_cmos_timer(void)
    /*
    * Propagate a new txc->status value into the NTP state:
    */
    -static inline void process_adj_status(struct timex *txc, struct timespec64 *ts)
    +static inline void process_adj_status(struct timex *txc)
    {
    if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) {
    time_state = TIME_OK;
    @@ -665,12 +665,10 @@ static inline void process_adj_status(struct timex *txc, struct timespec64 *ts)
    }


    -static inline void process_adjtimex_modes(struct timex *txc,
    - struct timespec64 *ts,
    - s32 *time_tai)
    +static inline void process_adjtimex_modes(struct timex *txc, s32 *time_tai)
    {
    if (txc->modes & ADJ_STATUS)
    - process_adj_status(txc, ts);
    + process_adj_status(txc);

    if (txc->modes & ADJ_NANO)
    time_status |= STA_NANO;
    @@ -735,7 +733,7 @@ int __do_adjtimex(struct timex *txc, struct timespec64 *ts, s32 *time_tai)

    /* If there are input parameters, then process them: */
    if (txc->modes)
    - process_adjtimex_modes(txc, ts, time_tai);
    + process_adjtimex_modes(txc, time_tai);

    txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,
    NTP_SCALE_SHIFT);
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-07-20 02:39    [W:2.339 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site