From patchwork Fri Jul 20 00:38:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142389 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2346257ljj; Thu, 19 Jul 2018 17:38:55 -0700 (PDT) X-Received: by 2002:a62:2744:: with SMTP id n65-v6mr7901110pfn.125.1532047134886; Thu, 19 Jul 2018 17:38:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532047134; cv=none; d=google.com; s=arc-20160816; b=rRG3DD1JYOZNTvpevDceJzC6OGB8dAMyLG6371tp8k5PtQnGAwkEdr22NSaJkDXdQI oqMvbHyTTJTWkFeLWpaW7y2pVA4d09gcPqB5XuwS0NRoe7SQQwYpQtpGXsaZcuwiWyvf CUao5eDdqcM63qJCeXc//QcIXBaOmi2qQS7Szpi76cDnOKVWJB2KW9xijhj4s3hxOqIH 5CzM8Pef7UCLy3BH/DwoUKv5WNmQLncTH03VF6/HIRA1IGVXSHi8HThoglMTIYKXEm5Y 9O2j697FaF6++eARZIiUDyPS/FuFnqOeph2dhqguqKHbhva3JKk0zoE57xkaWao392Vc 1Kzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=Dw/oxzW8/jxmVrKujqloAZWpXoumHLdiLMxwHNKgBis=; b=RW+K9lKupswdDcwUdXCpnJF5zYdv6sgFyO3+i5hYWwuzFvt/96SphGKD0sxcZ6tDb5 5H+RDmrQ01+Oh4p4YQwcujrgJ0jO2nC9cPr+IQiyuoHkJiAxZ7tozPmFL3Lyr/xbZ+/w Z11LIVEc7BnyuTBLYcOGQG7btLcPJ2zxfZflJJKK6zhCx+/Gb9Aq2K1+YGo215kn7Hjx DsuFWdGJ05uXzU9r99piLImDb/3F1pMkteFciMRO2hXGVmbvTxphOZSgyhd2m0+8stOF jv3hr5rrvReDnWs8Me1jRvIY3cVgHsVSc/W2Ie8RqJ480b3yYPb20VZJqs/eG5BLuyxF Ocfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jf2R5AZm; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r19-v6sor138957pgl.272.2018.07.19.17.38.54 for (Google Transport Security); Thu, 19 Jul 2018 17:38:54 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jf2R5AZm; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dw/oxzW8/jxmVrKujqloAZWpXoumHLdiLMxwHNKgBis=; b=Jf2R5AZmRlR1FrKf0N8PUA60L9fHAFGCMl+kwD9C5lcKya1wGSGf4qfQepewreL+M+ 1oVSk1Nid2kSvQCCPW0R9Z72a1cYhUhwzBmShS591/Pt3zhqSlTcPT8LH4RQxFavlCHb Cl+aKB4h9pn7BWnTyD9ePGP8+t2lB7iHB2KtU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Dw/oxzW8/jxmVrKujqloAZWpXoumHLdiLMxwHNKgBis=; b=GqtDmAyeFIcNhhQI8+UH33wxfX2IilWKT/E0uK2sPrhYve9tgPk8VBtj/wozFwklpF b2S5vmz2IEHS1zTCv5Bb2tDH4RbvNgeXjjhCYkRP9+BX73IGmfTSzFV6RyYybrepES9r Iq/1gvhqeaHixb6FiNoq5bAtaaZ4IWn00IPiUWdhaoUhmdNXSNysqb0I6TyGwLonl7t1 z1iElyt1MmQqXn7OP5TdUyhDg3YNunS2FutgRjhsapK66exi20zGDDWNmdvr1aUgx0vD kbUbsNCFla6vwlbNKiVeXQX1KWwh/BxrKTpwqg2WrWg15wrl3iEKQloLHFsfOFb6cK3w dVPw== X-Gm-Message-State: AOUpUlHw+WUrMijzcj/toUp07FkUxlbgmLx7SvY2wQzO882gozPv2k+u HBGZmd6RLOUgHdmUaKIF1AF2lbIe X-Google-Smtp-Source: AAOMgpcz3LrcLWbk5etGyhitDy3l5l4zsrpDn1Vex0AgNVP/l+K+YkkpkE/cIOBnwymGSxH2sPPcgg== X-Received: by 2002:a63:195e:: with SMTP id 30-v6mr11843169pgz.192.1532047134389; Thu, 19 Jul 2018 17:38:54 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id x5-v6sm383881pfh.67.2018.07.19.17.38.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jul 2018 17:38:53 -0700 (PDT) From: John Stultz To: lkml Cc: Ondrej Mosnacek , Thomas Gleixner , Ingo Molnar , Miroslav Lichvar , Richard Cochran , Prarit Bhargava , Stephen Boyd , John Stultz Subject: [PATCH 1/5] ntp: Remove redundant arguments Date: Thu, 19 Jul 2018 17:38:43 -0700 Message-Id: <1532047127-26699-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532047127-26699-1-git-send-email-john.stultz@linaro.org> References: <1532047127-26699-1-git-send-email-john.stultz@linaro.org> From: Ondrej Mosnacek The 'ts' argument of process_adj_status() and process_adjtimex_modes() is unused and can be safely removed. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Miroslav Lichvar Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Signed-off-by: Ondrej Mosnacek Signed-off-by: John Stultz --- kernel/time/ntp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.7.4 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);