[PATCH] kunit: time: use is_leap_year() helper
Use the is_leap_year() helper from rtc.h instead of writing it by hand Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- kernel/time/time_test.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/time/time_test.c b/kernel/time/time_test.c index 2889763165e5..7c2fb5f775eb 100644 --- a/kernel/time/time_test.c +++ b/kernel/time/time_test.c @@ -2,14 +2,7 @@ #include <kunit/test.h> #include <linux/time.h> - -/* - * Traditional implementation of leap year evaluation. - */ -static bool is_leap(long year) -{ - return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0); -} +#include <linux/rtc.h> /* * Gets the last day of a month. @@ -17,7 +10,7 @@ static bool is_leap(long year) static int last_day_of_month(long year, int month) { if (month == 2) - return 28 + is_leap(year); + return 28 + is_leap_year(year); if (month == 4 || month == 6 || month == 9 || month == 11) return 30; return 31; -- 2.34.1
Use the is_leap_year() helper from rtc.h instead of writing it by hand Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- net/netfilter/xt_time.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c index 6aa12d0f54e2..00319d2a54da 100644 --- a/net/netfilter/xt_time.c +++ b/net/netfilter/xt_time.c @@ -14,6 +14,7 @@ #include <linux/ktime.h> #include <linux/module.h> +#include <linux/rtc.h> #include <linux/skbuff.h> #include <linux/types.h> #include <linux/netfilter/x_tables.h> @@ -64,11 +65,6 @@ static const u_int16_t days_since_epoch[] = { 3287, 2922, 2557, 2191, 1826, 1461, 1096, 730, 365, 0, }; -static inline bool is_leap(unsigned int y) -{ - return y % 4 == 0 && (y % 100 != 0 || y % 400 == 0); -} - /* * Each network packet has a (nano)seconds-since-the-epoch (SSTE) timestamp. * Since we match against days and daytime, the SSTE value needs to be @@ -138,7 +134,7 @@ static void localtime_3(struct xtm *r, time64_t time) * (A different approach to use would be to subtract a monthlength * from w repeatedly while counting.) */ - if (is_leap(year)) { + if (is_leap_year(year)) { /* use days_since_leapyear[] in a leap year */ for (i = ARRAY_SIZE(days_since_leapyear) - 1; i > 0 && days_since_leapyear[i] > w; --i) -- 2.34.1
participants (1)
-
Jinjie Ruan