[PATCH] RTC: Fix up some RTC whitespace and style (41623b06) · Commits · 戴 / test

arch/ppc/platforms/chrp_time.c

+12 −10

Original line number	Diff line number	Diff line
		@@ -129,8 +129,8 @@ unsigned long chrp_get_rtc_time(void)
		year = chrp_cmos_clock_read(RTC_YEAR);
		} while (sec != chrp_cmos_clock_read(RTC_SECONDS));

		if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD)
		{
		if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY)
		\|\| RTC_ALWAYS_BCD) {
		BCD_TO_BIN(sec);
		BCD_TO_BIN(min);
		BCD_TO_BIN(hour);
		@@ -138,7 +138,9 @@ unsigned long chrp_get_rtc_time(void)
		BCD_TO_BIN(mon);
		BCD_TO_BIN(year);
		}
		if ((year += 1900) < 1970)

		year += 1900;
		if (year < 1970)
		year += 100;
		return mktime(year, mon, day, hour, min, sec);
		}

+13 −10

Original line number	Diff line number	Diff line
		@@ -34,8 +34,7 @@ unsigned long get_cmos_time(void)
		year = CMOS_READ(RTC_YEAR);
		} while (sec != CMOS_READ(RTC_SECONDS));

		if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD)
		{
		if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD) {
		BCD_TO_BIN(sec);
		BCD_TO_BIN(min);
		BCD_TO_BIN(hour);
		@@ -43,9 +42,13 @@ unsigned long get_cmos_time(void)
		BCD_TO_BIN(mon);
		BCD_TO_BIN(year);
		}

		spin_unlock(&rtc_lock);
		if ((year += 1900) < 1970)

		year += 1900;
		if (year < 1970)
		year += 100;

		return mktime(year, mon, day, hour, min, sec);
		}

+11 −10

Original line number	Diff line number	Diff line
		@@ -92,8 +92,7 @@ static inline unsigned long mach_get_cmos_time(void)
		year = CMOS_READ(RTC_YEAR);
		} while (sec != CMOS_READ(RTC_SECONDS));

		if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD)
		{
		if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) \|\| RTC_ALWAYS_BCD) {
		BCD_TO_BIN(sec);
		BCD_TO_BIN(min);
		BCD_TO_BIN(hour);
		@@ -101,7 +100,9 @@ static inline unsigned long mach_get_cmos_time(void)
		BCD_TO_BIN(mon);
		BCD_TO_BIN(year);
		}
		if ((year += 1900) < 1970)

		year += 1900;
		if (year < 1970)
		year += 100;

		return mktime(year, mon, day, hour, min, sec);