Commit 34efabe4 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Michael Ellerman
Browse files

powerpc: remove unused to_tm() helper 



to_tm() is now completely unused, the only reference being in the
_dump_time() helper that is also unused. This removes both, leaving
the rest of the powerpc RTC code y2038 safe to as far as the hardware
supports.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5235afa8

arch/powerpc/include/asm/time.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ extern unsigned long tb_ticks_per_usec; 
extern unsigned long tb_ticks_per_sec;

extern struct clock_event_device decrementer_clockevent;



struct rtc_time;

extern void to_tm(int tim, struct rtc_time * tm);



extern void generic_calibrate_decr(void);

extern void hdec_interrupt(struct pt_regs *regs);

arch/powerpc/kernel/time.c

+0 −50
Original line number Diff line number Diff line
@@ -1159,56 +1159,6 @@ void __init time_init(void) 
#endif

}





#define FEBRUARY	2

#define	STARTOFTIME	1970

#define SECDAY		86400L

#define SECYR		(SECDAY * 365)

#define	leapyear(year)		((year) % 4 == 0 && \

				 ((year) % 100 != 0 || (year) % 400 == 0))

#define	days_in_year(a) 	(leapyear(a) ? 366 : 365)

#define	days_in_month(a) 	(month_days[(a) - 1])



static int month_days[12] = {

	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31

};



void to_tm(int tim, struct rtc_time * tm)

{

	register int    i;

	register long   hms, day;



	day = tim / SECDAY;

	hms = tim % SECDAY;



	/* Hours, minutes, seconds are easy */

	tm->tm_hour = hms / 3600;

	tm->tm_min = (hms % 3600) / 60;

	tm->tm_sec = (hms % 3600) % 60;



	/* Number of years in days */

	for (i = STARTOFTIME; day >= days_in_year(i); i++)

		day -= days_in_year(i);

	tm->tm_year = i;



	/* Number of months in days left */

	if (leapyear(tm->tm_year))

		days_in_month(FEBRUARY) = 29;

	for (i = 1; day >= days_in_month(i); i++)

		day -= days_in_month(i);

	days_in_month(FEBRUARY) = 28;

	tm->tm_mon = i;



	/* Days are what is left over (+1) from all that. */

	tm->tm_mday = day + 1;



	/*

	 * No-one uses the day of the week.

	 */

	tm->tm_wday = -1;

}

EXPORT_SYMBOL(to_tm);



/*

 * Divide a 128-bit dividend by a 32-bit divisor, leaving a 128 bit

 * result.

arch/powerpc/platforms/ps3/time.c

+0 −24
Original line number Diff line number Diff line
@@ -28,30 +28,6 @@ 


#include "platform.h"



#define dump_tm(_a) _dump_tm(_a, __func__, __LINE__)

static void _dump_tm(const struct rtc_time *tm, const char* func, int line)

{

	pr_debug("%s:%d tm_sec  %d\n", func, line, tm->tm_sec);

	pr_debug("%s:%d tm_min  %d\n", func, line, tm->tm_min);

	pr_debug("%s:%d tm_hour %d\n", func, line, tm->tm_hour);

	pr_debug("%s:%d tm_mday %d\n", func, line, tm->tm_mday);

	pr_debug("%s:%d tm_mon  %d\n", func, line, tm->tm_mon);

	pr_debug("%s:%d tm_year %d\n", func, line, tm->tm_year);

	pr_debug("%s:%d tm_wday %d\n", func, line, tm->tm_wday);

}



#define dump_time(_a) _dump_time(_a, __func__, __LINE__)

static void __maybe_unused _dump_time(int time, const char *func,

	int line)

{

	struct rtc_time tm;



	to_tm(time, &tm);



	pr_debug("%s:%d time    %d\n", func, line, time);

	_dump_tm(&tm, func, line);

}



void __init ps3_calibrate_decr(void)

{

	int result;

CRA Git | Maintained and supported by SUSTech CRA and CCSE