svn commit: r338433 - in head/sys: amd64/include dev/efidev
Konstantin Belousov
kib at FreeBSD.org
Sun Sep 2 19:48:43 UTC 2018
Author: kib
Date: Sun Sep 2 19:48:41 2018
New Revision: 338433
URL: https://svnweb.freebsd.org/changeset/base/338433
Log:
Normalize use of semicolon with EFI_TIME_LOCK macros.
Reviewed by: kevans
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Approved by: re (rgrimes)
Differential revision: https://reviews.freebsd.org/D16972
Modified:
head/sys/amd64/include/efi.h
head/sys/dev/efidev/efirt.c
Modified: head/sys/amd64/include/efi.h
==============================================================================
--- head/sys/amd64/include/efi.h Sun Sep 2 18:40:18 2018 (r338432)
+++ head/sys/amd64/include/efi.h Sun Sep 2 19:48:41 2018 (r338433)
@@ -48,9 +48,9 @@
#ifdef _KERNEL
#include <isa/rtc.h>
-#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock);
-#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock);
-#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED);
+#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock)
+#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock)
+#define EFI_TIME_OWNED() mtx_assert(&atrtc_time_lock, MA_OWNED)
#endif
#endif /* __AMD64_INCLUDE_EFI_H_ */
Modified: head/sys/dev/efidev/efirt.c
==============================================================================
--- head/sys/dev/efidev/efirt.c Sun Sep 2 18:40:18 2018 (r338432)
+++ head/sys/dev/efidev/efirt.c Sun Sep 2 19:48:41 2018 (r338433)
@@ -299,7 +299,7 @@ efi_get_time_locked(struct efi_tm *tm, struct efi_tmca
efi_status status;
int error;
- EFI_TIME_OWNED()
+ EFI_TIME_OWNED();
error = efi_enter();
if (error != 0)
return (error);
@@ -317,7 +317,7 @@ efi_get_time(struct efi_tm *tm)
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
/*
* UEFI spec states that the Capabilities argument to GetTime is
* optional, but some UEFI implementations choke when passed a NULL
@@ -325,7 +325,7 @@ efi_get_time(struct efi_tm *tm)
* to workaround such implementations.
*/
error = efi_get_time_locked(tm, &dummy);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
@@ -337,9 +337,9 @@ efi_get_time_capabilities(struct efi_tmcap *tmcap)
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
error = efi_get_time_locked(&dummy, tmcap);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
@@ -379,9 +379,9 @@ efi_set_time(struct efi_tm *tm)
if (efi_runtime == NULL)
return (ENXIO);
- EFI_TIME_LOCK()
+ EFI_TIME_LOCK();
error = efi_set_time_locked(tm);
- EFI_TIME_UNLOCK()
+ EFI_TIME_UNLOCK();
return (error);
}
More information about the svn-src-all
mailing list