Message ID | 20200825090907.66681-2-tsbogend@alpha.franken.de (mailing list archive) |
---|---|
State | Accepted |
Commit | 942b14fb3e58fd994cf23cb67da0e5998e995b61 |
Headers | show |
Series | [1/4] MIPS: SGI-IP27: No need for kmalloc.h | expand |
在 2020/8/25 下午5:09, Thomas Bogendoerfer 写道: > Loonson2ef's mc146818rtc.h is the same as the generic one -> remove it. > > Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Acked-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > --- > .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 ---------------------- > 1 file changed, 36 deletions(-) > delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h > > diff --git a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h b/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h > deleted file mode 100644 > index 00d602629a55..000000000000 > --- a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h > +++ /dev/null > @@ -1,36 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 1998, 2001, 03, 07 by Ralf Baechle (ralf@linux-mips.org) > - * > - * RTC routines for PC style attached Dallas chip. > - */ > -#ifndef __ASM_MACH_LOONGSON2EF_MC146818RTC_H > -#define __ASM_MACH_LOONGSON2EF_MC146818RTC_H > - > -#include <linux/io.h> > - > -#define RTC_PORT(x) (0x70 + (x)) > -#define RTC_IRQ 8 > - > -static inline unsigned char CMOS_READ(unsigned long addr) > -{ > - outb_p(addr, RTC_PORT(0)); > - return inb_p(RTC_PORT(1)); > -} > - > -static inline void CMOS_WRITE(unsigned char data, unsigned long addr) > -{ > - outb_p(addr, RTC_PORT(0)); > - outb_p(data, RTC_PORT(1)); > -} > - > -#define RTC_ALWAYS_BCD 0 > - > -#ifndef mc146818_decode_year > -#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970) > -#endif > - > -#endif /* __ASM_MACH_LOONGSON2EF_MC146818RTC_H */
diff --git a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h b/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h deleted file mode 100644 index 00d602629a55..000000000000 --- a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 1998, 2001, 03, 07 by Ralf Baechle (ralf@linux-mips.org) - * - * RTC routines for PC style attached Dallas chip. - */ -#ifndef __ASM_MACH_LOONGSON2EF_MC146818RTC_H -#define __ASM_MACH_LOONGSON2EF_MC146818RTC_H - -#include <linux/io.h> - -#define RTC_PORT(x) (0x70 + (x)) -#define RTC_IRQ 8 - -static inline unsigned char CMOS_READ(unsigned long addr) -{ - outb_p(addr, RTC_PORT(0)); - return inb_p(RTC_PORT(1)); -} - -static inline void CMOS_WRITE(unsigned char data, unsigned long addr) -{ - outb_p(addr, RTC_PORT(0)); - outb_p(data, RTC_PORT(1)); -} - -#define RTC_ALWAYS_BCD 0 - -#ifndef mc146818_decode_year -#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970) -#endif - -#endif /* __ASM_MACH_LOONGSON2EF_MC146818RTC_H */
Loonson2ef's mc146818rtc.h is the same as the generic one -> remove it. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- .../include/asm/mach-loongson2ef/mc146818rtc.h | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h