Skip to content

Commit 6e68ee3

Browse files
matjontsbogend
authored andcommitted
mips: remove redundant macro mc146818_decode_year
The mc146818_decode_year macro is used only in mc146818_get_cmos_time(), which in turn is called only in arch/mips/loongson2ef/common/time.c and arch/mips/mti-malta/malta-time.c so on mach-jazz it is unused and can be removed. On other platforms it is defined in the same way, so it can be safely folded into mc146818_get_cmos_time(). Signed-off-by: Mateusz Jończyk <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 3b3c4f9 commit 6e68ee3

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

arch/mips/include/asm/mach-generic/mc146818rtc.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,4 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
2929

3030
#define RTC_ALWAYS_BCD 0
3131

32-
#ifndef mc146818_decode_year
33-
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
34-
#endif
35-
3632
#endif /* __ASM_MACH_GENERIC_MC146818RTC_H */

arch/mips/include/asm/mach-jazz/mc146818rtc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
3333

3434
#define RTC_ALWAYS_BCD 0
3535

36-
#define mc146818_decode_year(year) ((year) + 1980)
37-
3836
#endif /* __ASM_MACH_JAZZ_MC146818RTC_H */

arch/mips/include/asm/mach-malta/mc146818rtc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,4 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
3131

3232
#define RTC_ALWAYS_BCD 0
3333

34-
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
35-
3634
#endif /* __ASM_MACH_MALTA_MC146818RTC_H */

arch/mips/include/asm/mc146818-time.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ static inline time64_t mc146818_get_cmos_time(void)
3737
year = bcd2bin(year);
3838
}
3939
spin_unlock_irqrestore(&rtc_lock, flags);
40-
year = mc146818_decode_year(year);
40+
if (year < 70)
41+
year += 2000;
42+
else
43+
year += 1900;
4144

4245
return mktime64(year, mon, day, hour, min, sec);
4346
}

0 commit comments

Comments
 (0)